From 72a202dd5bd0004f7bb8d440ce2feea02229b2ce Mon Sep 17 00:00:00 2001 From: Dima Landiak Date: Fri, 9 Mar 2018 19:51:03 +0200 Subject: [PATCH 01/75] opc fix --- .../extensions-forms/extension-form-opc.directive.js | 4 ++-- .../extension/extensions-forms/extension-form-opc.tpl.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js index bf4886c994..967c561eb9 100644 --- a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js +++ b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js @@ -129,7 +129,7 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra if (addedFile && addedFile.length > 0) { model[options.fileName] = $file.name; - model[options.file] = addedFile.replace(/^data.*base64,/, ""); + model[options.location] = addedFile.replace(/^data.*base64,/, ""); } } @@ -143,7 +143,7 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra scope.theForm.$setDirty(); model[options.fileName] = null; - model[options.file] = null; + model[options.location] = null; }; diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html index 501eeebd07..99464cc038 100644 --- a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html +++ b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html @@ -212,8 +212,8 @@
-
- +
+
@@ -231,7 +231,7 @@ class="file-input" flow-btn id="dropFileKeystore_{{serverIndex}}" name="keystoreFile" - ng-model="server.keystore.file" + ng-model="server.keystore.location" >
From 8cb79bfc084e5db4e1bd266cac50faacb00a7afc Mon Sep 17 00:00:00 2001 From: Dima Landiak Date: Mon, 12 Mar 2018 20:36:52 +0200 Subject: [PATCH 02/75] changed fields names --- .../extensions-forms/extension-form-opc.directive.js | 6 +++--- .../extensions-forms/extension-form-opc.tpl.html | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js index 967c561eb9..e1d2519ae3 100644 --- a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js +++ b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js @@ -128,8 +128,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra let addedFile = event.target.result; if (addedFile && addedFile.length > 0) { - model[options.fileName] = $file.name; - model[options.location] = addedFile.replace(/^data.*base64,/, ""); + model[options.location] = $file.name; + model[options.fileContent] = addedFile.replace(/^data.*base64,/, ""); } } @@ -142,8 +142,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra scope.clearFile = function(model, options) { scope.theForm.$setDirty(); - model[options.fileName] = null; model[options.location] = null; + model[options.fileContent] = null; }; diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html index 99464cc038..5a7c00ba3b 100644 --- a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html +++ b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html @@ -212,8 +212,8 @@
-
- +
+
@@ -231,14 +231,14 @@ class="file-input" flow-btn id="dropFileKeystore_{{serverIndex}}" name="keystoreFile" - ng-model="server.keystore.location" + ng-model="server.keystore.fileContent" >
-
extension.no-file
-
{{server.keystore[fieldsToFill.fileName]}}
+
extension.no-file
+
{{server.keystore[fieldsToFill.location]}}
From ae45a62f2fa1d4667dd31e65e6be4d62515a94b9 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 14 Mar 2018 20:43:56 +0200 Subject: [PATCH 03/75] Rule Chains UI --- .../server/actors/ActorSystemContext.java | 4 + .../plugin/PluginProcessingContext.java | 26 +++ .../plugin/SharedPluginProcessingContext.java | 3 + .../server/controller/BaseController.java | 2 + .../controller/RuleChainController.java | 38 ++++ .../server/dao/audit/AuditLogServiceImpl.java | 18 +- .../server/dao/rule/BaseRuleChainService.java | 7 + .../server/dao/rule/RuleChainService.java | 3 + ui/src/app/api/rule-chain.service.js | 150 +++++++++++++++ ui/src/app/app.js | 2 + ui/src/app/common/types.constant.js | 9 +- .../import-export/import-export.service.js | 59 +++++- ui/src/app/layout/index.js | 2 + ui/src/app/locale/locale.constant.js | 36 ++++ ui/src/app/rulechain/add-rulechain.tpl.html | 48 +++++ ui/src/app/rulechain/index.js | 25 +++ ui/src/app/rulechain/rulechain-card.tpl.html | 18 ++ .../app/rulechain/rulechain-fieldset.tpl.html | 49 +++++ ui/src/app/rulechain/rulechain.controller.js | 172 ++++++++++++++++++ ui/src/app/rulechain/rulechain.directive.js | 47 +++++ ui/src/app/rulechain/rulechain.routes.js | 46 +++++ ui/src/app/rulechain/rulechains.tpl.html | 75 ++++++++ ui/src/app/services/menu.service.js | 32 ++++ 23 files changed, 865 insertions(+), 6 deletions(-) create mode 100644 ui/src/app/api/rule-chain.service.js create mode 100644 ui/src/app/rulechain/add-rulechain.tpl.html create mode 100644 ui/src/app/rulechain/index.js create mode 100644 ui/src/app/rulechain/rulechain-card.tpl.html create mode 100644 ui/src/app/rulechain/rulechain-fieldset.tpl.html create mode 100644 ui/src/app/rulechain/rulechain.controller.js create mode 100644 ui/src/app/rulechain/rulechain.directive.js create mode 100644 ui/src/app/rulechain/rulechain.routes.js create mode 100644 ui/src/app/rulechain/rulechains.tpl.html diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 77953c9dc1..f59ec63ed7 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -46,6 +46,7 @@ import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.event.EventService; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.relation.RelationService; +import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.timeseries.TimeseriesService; @@ -96,6 +97,9 @@ public class ActorSystemContext { @Autowired @Getter private RuleService ruleService; + @Autowired + @Getter private RuleChainService ruleChainService; + @Autowired @Getter private PluginService pluginService; diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index ce95ee4629..10f16ce8b1 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -36,6 +36,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; @@ -330,6 +331,9 @@ public final class PluginProcessingContext implements PluginContext { case RULE: validateRule(ctx, entityId, callback); return; + case RULE_CHAIN: + validateRuleChain(ctx, entityId, callback); + return; case PLUGIN: validatePlugin(ctx, entityId, callback); return; @@ -411,6 +415,28 @@ public final class PluginProcessingContext implements PluginContext { } } + private void validateRuleChain(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { + if (ctx.isCustomerUser()) { + callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture ruleChainFuture = pluginCtx.ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); + Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { + if (ruleChain == null) { + return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); + } else { + if (ctx.isTenantAdmin() && !ruleChain.getTenantId().equals(ctx.getTenantId())) { + return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); + } else if (ctx.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { + return ValidationResult.accessDenied("Rule chain is not in system scope!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validatePlugin(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { if (ctx.isCustomerUser()) { callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java index 06138a3308..182897025e 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java @@ -32,6 +32,7 @@ import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.relation.RelationService; +import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.timeseries.TimeseriesService; @@ -56,6 +57,7 @@ public final class SharedPluginProcessingContext { final AssetService assetService; final DeviceService deviceService; final RuleService ruleService; + final RuleChainService ruleChainService; final PluginService pluginService; final CustomerService customerService; final TenantService tenantService; @@ -84,6 +86,7 @@ public final class SharedPluginProcessingContext { this.rpcService = sysContext.getRpcService(); this.routingService = sysContext.getRoutingService(); this.ruleService = sysContext.getRuleService(); + this.ruleChainService = sysContext.getRuleChainService(); this.pluginService = sysContext.getPluginService(); this.customerService = sysContext.getCustomerService(); this.tenantService = sysContext.getTenantService(); diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index 83b304fb8b..2a4ba719af 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -550,6 +550,8 @@ public abstract class BaseController { throw new ThingsboardException(YOU_DON_T_HAVE_PERMISSION_TO_PERFORM_THIS_OPERATION, ThingsboardErrorCode.PERMISSION_DENIED); + } else if (tenantId.getId().equals(ModelConstants.NULL_UUID)) { + ruleChain.setConfiguration(null); } } return ruleChain; diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index 012e0770b3..f24646b56f 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.exception.ThingsboardException; @@ -53,6 +54,21 @@ public class RuleChainController extends BaseController { } } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") + @RequestMapping(value = "/ruleChain/{ruleChainId}/metadata", method = RequestMethod.GET) + @ResponseBody + public RuleChainMetaData getRuleChainMetaData(@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException { + checkParameter(RULE_CHAIN_ID, strRuleChainId); + try { + RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId)); + checkRuleChain(ruleChainId); + return ruleChainService.loadRuleChainMetaData(ruleChainId); + } catch (Exception e) { + throw handleException(e); + } + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") @RequestMapping(value = "/ruleChain", method = RequestMethod.POST) @ResponseBody @@ -76,6 +92,28 @@ public class RuleChainController extends BaseController { } } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") + @RequestMapping(value = "/ruleChain/metadata", method = RequestMethod.POST) + @ResponseBody + public RuleChainMetaData saveRuleChainMetaData(@RequestBody RuleChainMetaData ruleChainMetaData) throws ThingsboardException { + try { + RuleChain ruleChain = checkRuleChain(ruleChainMetaData.getRuleChainId()); + RuleChainMetaData savedRuleChainMetaData = checkNotNull(ruleChainService.saveRuleChainMetaData(ruleChainMetaData)); + + logEntityAction(ruleChain.getId(), ruleChain, + null, + ActionType.UPDATED, null, ruleChainMetaData); + + return savedRuleChainMetaData; + } catch (Exception e) { + + logEntityAction(emptyId(EntityType.RULE_CHAIN), null, + null, ActionType.UPDATED, e, ruleChainMetaData); + + throw handleException(e); + } + } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") @RequestMapping(value = "/ruleChains", params = {"limit"}, method = RequestMethod.GET) @ResponseBody diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java index 23fadeba0e..2a491300b0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java @@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.audit.sink.AuditLogSink; import org.thingsboard.server.dao.entity.EntityService; @@ -158,11 +159,20 @@ public class AuditLogServiceImpl implements AuditLogService { switch(actionType) { case ADDED: case UPDATED: - ObjectNode entityNode = objectMapper.valueToTree(entity); - if (entityId.getEntityType() == EntityType.DASHBOARD) { - entityNode.put("configuration", ""); + if (entity != null) { + ObjectNode entityNode = objectMapper.valueToTree(entity); + if (entityId.getEntityType() == EntityType.DASHBOARD) { + entityNode.put("configuration", ""); + } + actionData.set("entity", entityNode); + } + if (entityId.getEntityType() == EntityType.RULE_CHAIN) { + RuleChainMetaData ruleChainMetaData = extractParameter(RuleChainMetaData.class, additionalInfo); + if (ruleChainMetaData != null) { + ObjectNode ruleChainMetaDataNode = objectMapper.valueToTree(ruleChainMetaData); + actionData.set("metadata", ruleChainMetaDataNode); + } } - actionData.set("entity", entityNode); break; case DELETED: case ACTIVATED: diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 1e791635c9..04207ec2f5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.rule; +import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -218,6 +219,12 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC return ruleChainDao.findById(ruleChainId.getId()); } + @Override + public ListenableFuture findRuleChainByIdAsync(RuleChainId ruleChainId) { + Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); + return ruleChainDao.findByIdAsync(ruleChainId.getId()); + } + @Override public RuleChain getRootTenantRuleChain(TenantId tenantId) { Validator.validateId(tenantId, "Incorrect tenant id for search request."); diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java index 6c44090564..e5f2840b8b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.rule; +import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; @@ -41,6 +42,8 @@ public interface RuleChainService { RuleChain findRuleChainById(RuleChainId ruleChainId); + ListenableFuture findRuleChainByIdAsync(RuleChainId ruleChainId); + RuleChain getRootTenantRuleChain(TenantId tenantId); List getRuleChainNodes(RuleChainId ruleChainId); diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js new file mode 100644 index 0000000000..16afa747b8 --- /dev/null +++ b/ui/src/app/api/rule-chain.service.js @@ -0,0 +1,150 @@ +/* + * Copyright © 2016-2018 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. + */ +export default angular.module('thingsboard.api.ruleChain', []) + .factory('ruleChainService', RuleChainService).name; + +/*@ngInject*/ +function RuleChainService($http, $q) { + + var service = { + getSystemRuleChains: getSystemRuleChains, + getTenantRuleChains: getTenantRuleChains, + getRuleChains: getRuleChains, + getRuleChain: getRuleChain, + saveRuleChain: saveRuleChain, + deleteRuleChain: deleteRuleChain, + getRuleChainMetaData: getRuleChainMetaData, + saveRuleChainMetaData: saveRuleChainMetaData + }; + + return service; + + function getSystemRuleChains (pageLink, config) { + var deferred = $q.defer(); + var url = '/api/system/ruleChains?limit=' + pageLink.limit; + if (angular.isDefined(pageLink.textSearch)) { + url += '&textSearch=' + pageLink.textSearch; + } + if (angular.isDefined(pageLink.idOffset)) { + url += '&idOffset=' + pageLink.idOffset; + } + if (angular.isDefined(pageLink.textOffset)) { + url += '&textOffset=' + pageLink.textOffset; + } + $http.get(url, config).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function getTenantRuleChains (pageLink, config) { + var deferred = $q.defer(); + var url = '/api/tenant/ruleChains?limit=' + pageLink.limit; + if (angular.isDefined(pageLink.textSearch)) { + url += '&textSearch=' + pageLink.textSearch; + } + if (angular.isDefined(pageLink.idOffset)) { + url += '&idOffset=' + pageLink.idOffset; + } + if (angular.isDefined(pageLink.textOffset)) { + url += '&textOffset=' + pageLink.textOffset; + } + $http.get(url, config).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function getRuleChains (pageLink, config) { + var deferred = $q.defer(); + var url = '/api/ruleChains?limit=' + pageLink.limit; + if (angular.isDefined(pageLink.textSearch)) { + url += '&textSearch=' + pageLink.textSearch; + } + if (angular.isDefined(pageLink.idOffset)) { + url += '&idOffset=' + pageLink.idOffset; + } + if (angular.isDefined(pageLink.textOffset)) { + url += '&textOffset=' + pageLink.textOffset; + } + $http.get(url, config).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function getRuleChain(ruleChainId, config) { + var deferred = $q.defer(); + var url = '/api/ruleChain/' + ruleChainId; + $http.get(url, config).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function saveRuleChain(ruleChain) { + var deferred = $q.defer(); + var url = '/api/ruleChain'; + $http.post(url, ruleChain).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function deleteRuleChain(ruleChainId) { + var deferred = $q.defer(); + var url = '/api/ruleChain/' + ruleChainId; + $http.delete(url).then(function success() { + deferred.resolve(); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function getRuleChainMetaData(ruleChainId, config) { + var deferred = $q.defer(); + var url = '/api/ruleChain/' + ruleChainId + '/metadata'; + $http.get(url, config).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + + function saveRuleChainMetaData(ruleChainMetaData) { + var deferred = $q.defer(); + var url = '/api/ruleChain/metadata'; + $http.post(url, ruleChainMetaData).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } + +} diff --git a/ui/src/app/app.js b/ui/src/app/app.js index 0b6a141ba3..138b2308f3 100644 --- a/ui/src/app/app.js +++ b/ui/src/app/app.js @@ -73,6 +73,7 @@ import thingsboardApiAttribute from './api/attribute.service'; import thingsboardApiEntity from './api/entity.service'; import thingsboardApiAlarm from './api/alarm.service'; import thingsboardApiAuditLog from './api/audit-log.service'; +import thingsboardApiRuleChain from './api/rule-chain.service'; import 'typeface-roboto'; import 'font-awesome/css/font-awesome.min.css'; @@ -135,6 +136,7 @@ angular.module('thingsboard', [ thingsboardApiEntity, thingsboardApiAlarm, thingsboardApiAuditLog, + thingsboardApiRuleChain, uiRouter]) .config(AppConfig) .factory('globalInterceptor', GlobalInterceptor) diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index ef6ffde28a..77c21e1fd0 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -294,7 +294,8 @@ export default angular.module('thingsboard.types', []) customer: "CUSTOMER", user: "USER", dashboard: "DASHBOARD", - alarm: "ALARM" + alarm: "ALARM", + rulechain: "RULE_CHAIN" }, aliasEntityType: { current_customer: "CURRENT_CUSTOMER" @@ -354,6 +355,12 @@ export default angular.module('thingsboard.types', []) list: 'entity.list-of-alarms', nameStartsWith: 'entity.alarm-name-starts-with' }, + "RULE_CHAIN": { + type: 'entity.type-rulechain', + typePlural: 'entity.type-rulechains', + list: 'entity.list-of-rulechains', + nameStartsWith: 'entity.rulechain-name-starts-with' + }, "CURRENT_CUSTOMER": { type: 'entity.type-current-customer', list: 'entity.type-current-customer' diff --git a/ui/src/app/import-export/import-export.service.js b/ui/src/app/import-export/import-export.service.js index 6071fd23ed..19c249f869 100644 --- a/ui/src/app/import-export/import-export.service.js +++ b/ui/src/app/import-export/import-export.service.js @@ -26,7 +26,7 @@ import entityAliasesTemplate from '../entity/alias/entity-aliases.tpl.html'; /*@ngInject*/ export default function ImportExport($log, $translate, $q, $mdDialog, $document, $http, itembuffer, utils, types, dashboardUtils, entityService, dashboardService, pluginService, ruleService, - widgetService, toast, attributeService) { + ruleChainService, widgetService, toast, attributeService) { var service = { @@ -38,6 +38,8 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document, importPlugin: importPlugin, exportRule: exportRule, importRule: importRule, + exportRuleChain: exportRuleChain, + importRuleChain: importRuleChain, exportWidgetType: exportWidgetType, importWidgetType: importWidgetType, exportWidgetsBundle: exportWidgetsBundle, @@ -275,6 +277,61 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document, return true; } + // Rule chain functions + + function exportRuleChain(ruleChainId) { + ruleChainService.getRuleChain(ruleChainId).then( + function success(ruleChain) { + var name = ruleChain.name; + name = name.toLowerCase().replace(/\W/g,"_"); + exportToPc(prepareExport(ruleChain), name + '.json'); + //TODO: metadata + }, + function fail(rejection) { + var message = rejection; + if (!message) { + message = $translate.instant('error.unknown-error'); + } + toast.showError($translate.instant('rulechain.export-failed-error', {error: message})); + } + ); + } + + function importRuleChain($event) { + var deferred = $q.defer(); + openImportDialog($event, 'rulechain.import', 'rulechain.rulechain-file').then( + function success(ruleChain) { + if (!validateImportedRuleChain(ruleChain)) { + toast.showError($translate.instant('rulechain.invalid-rulechain-file-error')); + deferred.reject(); + } else { + //TODO: rulechain metadata + ruleChainService.saveRuleChain(ruleChain).then( + function success() { + deferred.resolve(); + }, + function fail() { + deferred.reject(); + } + ); + } + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + function validateImportedRuleChain(ruleChain) { + //TODO: rulechain metadata + if (angular.isUndefined(ruleChain.name)) + { + return false; + } + return true; + } + // Plugin functions function exportPlugin(pluginId) { diff --git a/ui/src/app/layout/index.js b/ui/src/app/layout/index.js index e5ca958342..e90334bf52 100644 --- a/ui/src/app/layout/index.js +++ b/ui/src/app/layout/index.js @@ -49,6 +49,7 @@ import thingsboardWidgetLibrary from '../widget'; import thingsboardDashboard from '../dashboard'; import thingsboardPlugin from '../plugin'; import thingsboardRule from '../rule'; +import thingsboardRuleChain from '../rulechain'; import thingsboardJsonForm from '../jsonform'; @@ -81,6 +82,7 @@ export default angular.module('thingsboard.home', [ thingsboardDashboard, thingsboardPlugin, thingsboardRule, + thingsboardRuleChain, thingsboardJsonForm, thingsboardApiDevice, thingsboardApiLogin, diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 252884dfc7..ea576ecf51 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -745,6 +745,10 @@ export default angular.module('thingsboard.locale', []) "type-alarms": "Alarms", "list-of-alarms": "{ count, select, 1 {One alarms} other {List of # alarms} }", "alarm-name-starts-with": "Alarms whose names start with '{{prefix}}'", + "type-rulechain": "Rule chain", + "type-rulechains": "Rule chains", + "list-of-rulechains": "{ count, select, 1 {One rule chain} other {List of # rule chains} }", + "rulechain-name-starts-with": "Rule chains whose names start with '{{prefix}}'", "type-current-customer": "Current Customer", "search": "Search entities", "selected-entities": "{ count, select, 1 {1 entity} other {# entities} } selected", @@ -1133,6 +1137,38 @@ export default angular.module('thingsboard.locale', []) "no-rules-matching": "No rules matching '{{entity}}' were found.", "rule-required": "Rule is required" }, + "rulechain": { + "rulechain": "Rule chain", + "rulechains": "Rule chains", + "delete": "Delete rule chain", + "name": "Name", + "name-required": "Name is required.", + "description": "Description", + "add": "Add Rule Chain", + "delete-rulechain-title": "Are you sure you want to delete the rule chain '{{ruleChainName}}'?", + "delete-rulechain-text": "Be careful, after the confirmation the rule chain and all related data will become unrecoverable.", + "delete-rulechains-title": "Are you sure you want to delete { count, select, 1 {1 rule chain} other {# rule chains} }?", + "delete-rulechains-action-title": "Delete { count, select, 1 {1 rule chain} other {# rule chains} }", + "delete-rulechains-text": "Be careful, after the confirmation all selected rule chains will be removed and all related data will become unrecoverable.", + "add-rulechain-text": "Add new rule chain", + "no-rulechains-text": "No rule chains found", + "rulechain-details": "Rule chain details", + "details": "Details", + "events": "Events", + "system": "System", + "import": "Import rule chain", + "export": "Export rule chain", + "export-failed-error": "Unable to export rule chain: {{error}}", + "create-new-rulechain": "Create new rule chain", + "rule-file": "Rule chain file", + "invalid-rulechain-file-error": "Unable to import rule chain: Invalid rule chain data structure.", + "copyId": "Copy rule chain Id", + "idCopiedMessage": "Rule chain Id has been copied to clipboard", + "select-rulechain": "Select rule chain", + "no-rulechains-matching": "No rule chains matching '{{entity}}' were found.", + "rulechain-required": "Rule chain is required", + "management": "Rules management" + }, "rule-plugin": { "management": "Rules and plugins management" }, diff --git a/ui/src/app/rulechain/add-rulechain.tpl.html b/ui/src/app/rulechain/add-rulechain.tpl.html new file mode 100644 index 0000000000..44d0ec364c --- /dev/null +++ b/ui/src/app/rulechain/add-rulechain.tpl.html @@ -0,0 +1,48 @@ + + +
+ +
+

rulechain.add

+ +
+ + + +
+ + + + +
+ +
+ + + + + {{ 'action.add' | translate }} + + {{ 'action.cancel' | + translate }} + + +
+ diff --git a/ui/src/app/rulechain/index.js b/ui/src/app/rulechain/index.js new file mode 100644 index 0000000000..faecc03e03 --- /dev/null +++ b/ui/src/app/rulechain/index.js @@ -0,0 +1,25 @@ +/* + * Copyright © 2016-2018 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. + */ + +import RuleChainRoutes from './rulechain.routes'; +import RuleChainController from './rulechain.controller'; +import RuleChainDirective from './rulechain.directive'; + +export default angular.module('thingsboard.ruleChain', []) + .config(RuleChainRoutes) + .controller('RuleChainController', RuleChainController) + .directive('tbRuleChain', RuleChainDirective) + .name; diff --git a/ui/src/app/rulechain/rulechain-card.tpl.html b/ui/src/app/rulechain/rulechain-card.tpl.html new file mode 100644 index 0000000000..48a572c8e0 --- /dev/null +++ b/ui/src/app/rulechain/rulechain-card.tpl.html @@ -0,0 +1,18 @@ + +
rulechain.system
diff --git a/ui/src/app/rulechain/rulechain-fieldset.tpl.html b/ui/src/app/rulechain/rulechain-fieldset.tpl.html new file mode 100644 index 0000000000..ec68c574bf --- /dev/null +++ b/ui/src/app/rulechain/rulechain-fieldset.tpl.html @@ -0,0 +1,49 @@ + +{{ 'rulechain.export' | translate }} +{{ 'rulechain.delete' | translate }} + +
+ + + rulechain.copyId + +
+ + +
+ + + +
+
rulechain.name-required
+
+ + + + + +
+ diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js new file mode 100644 index 0000000000..475ef4e09a --- /dev/null +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -0,0 +1,172 @@ +/* + * Copyright © 2016-2018 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. + */ +/* eslint-disable import/no-unresolved, import/default */ + +import addRuleChainTemplate from './add-rulechain.tpl.html'; +import ruleChainCard from './rulechain-card.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleChainController(ruleChainService, userService, importExport, $state, $stateParams, $filter, $translate, types) { + + var ruleChainActionsList = [ + { + onAction: function ($event, item) { + exportRuleChain($event, item); + }, + name: function() { $translate.instant('action.export') }, + details: function() { return $translate.instant('rulechain.export') }, + icon: "file_download" + }, + { + onAction: function ($event, item) { + vm.grid.deleteItem($event, item); + }, + name: function() { return $translate.instant('action.delete') }, + details: function() { return $translate.instant('rulechain.delete') }, + icon: "delete", + isEnabled: isRuleChainEditable + } + ]; + + var ruleChainAddItemActionsList = [ + { + onAction: function ($event) { + vm.grid.addItem($event); + }, + name: function() { return $translate.instant('action.create') }, + details: function() { return $translate.instant('rulechain.create-new-rulechain') }, + icon: "insert_drive_file" + }, + { + onAction: function ($event) { + importExport.importRuleChain($event).then( + function() { + vm.grid.refreshList(); + } + ); + }, + name: function() { return $translate.instant('action.import') }, + details: function() { return $translate.instant('rulechain.import') }, + icon: "file_upload" + } + ]; + + var vm = this; + + vm.types = types; + + vm.ruleChainGridConfig = { + + refreshParamsFunc: null, + + deleteItemTitleFunc: deleteRuleChainTitle, + deleteItemContentFunc: deleteRuleChainText, + deleteItemsTitleFunc: deleteRuleChainsTitle, + deleteItemsActionTitleFunc: deleteRuleChainsActionTitle, + deleteItemsContentFunc: deleteRuleChainsText, + + fetchItemsFunc: fetchRuleChains, + saveItemFunc: saveRuleChain, + deleteItemFunc: deleteRuleChain, + + getItemTitleFunc: getRuleChainTitle, + itemCardTemplateUrl: ruleChainCard, + parentCtl: vm, + + actionsList: ruleChainActionsList, + addItemActions: ruleChainAddItemActionsList, + + onGridInited: gridInited, + + addItemTemplateUrl: addRuleChainTemplate, + + addItemText: function() { return $translate.instant('rulechain.add-rulechain-text') }, + noItemsText: function() { return $translate.instant('rulechain.no-rulechains-text') }, + itemDetailsText: function() { return $translate.instant('rulechain.rulechain-details') }, + isSelectionEnabled: isRuleChainEditable, + isDetailsReadOnly: function(ruleChain) { + return !isRuleChainEditable(ruleChain); + } + }; + + if (angular.isDefined($stateParams.items) && $stateParams.items !== null) { + vm.ruleChainGridConfig.items = $stateParams.items; + } + + if (angular.isDefined($stateParams.topIndex) && $stateParams.topIndex > 0) { + vm.ruleChainGridConfig.topIndex = $stateParams.topIndex; + } + + vm.isRuleChainEditable = isRuleChainEditable; + + vm.exportRuleChain = exportRuleChain; + + function deleteRuleChainTitle(ruleChain) { + return $translate.instant('rulechain.delete-rulechain-title', {ruleChainName: ruleChain.name}); + } + + function deleteRuleChainText() { + return $translate.instant('rulechain.delete-rulechain-text'); + } + + function deleteRuleChainsTitle(selectedCount) { + return $translate.instant('rulechain.delete-rulechains-title', {count: selectedCount}, 'messageformat'); + } + + function deleteRuleChainsActionTitle(selectedCount) { + return $translate.instant('rulechain.delete-rulechains-action-title', {count: selectedCount}, 'messageformat'); + } + + function deleteRuleChainsText() { + return $translate.instant('rulechain.delete-rulechains-text'); + } + + function gridInited(grid) { + vm.grid = grid; + } + + function fetchRuleChains(pageLink) { + return ruleChainService.getRuleChains(pageLink); + } + + function saveRuleChain(ruleChain) { + return ruleChainService.saveRuleChain(ruleChain); + } + + function deleteRuleChain(ruleChainId) { + return ruleChainService.deleteRuleChain(ruleChainId); + } + + function getRuleChainTitle(ruleChain) { + return ruleChain ? ruleChain.name : ''; + } + + function isRuleChainEditable(ruleChain) { + if (userService.getAuthority() === 'TENANT_ADMIN') { + return ruleChain && ruleChain.tenantId.id != types.id.nullUid; + } else { + return userService.getAuthority() === 'SYS_ADMIN'; + } + } + + function exportRuleChain($event, ruleChain) { + $event.stopPropagation(); + importExport.exportRuleChain(ruleChain.id.id); + } + +} diff --git a/ui/src/app/rulechain/rulechain.directive.js b/ui/src/app/rulechain/rulechain.directive.js new file mode 100644 index 0000000000..b23cd98136 --- /dev/null +++ b/ui/src/app/rulechain/rulechain.directive.js @@ -0,0 +1,47 @@ +/* + * Copyright © 2016-2018 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. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) { + var linker = function (scope, element) { + var template = $templateCache.get(ruleChainFieldsetTemplate); + element.html(template); + + scope.onRuleChainIdCopied = function() { + toast.showSuccess($translate.instant('rulechain.idCopiedMessage'), 750, angular.element(element).parent().parent(), 'bottom left'); + }; + + $compile(element.contents())(scope); + } + return { + restrict: "E", + link: linker, + scope: { + ruleChain: '=', + isEdit: '=', + isReadOnly: '=', + theForm: '=', + onExportRuleChain: '&', + onDeleteRuleChain: '&' + } + }; +} diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js new file mode 100644 index 0000000000..e8d6be49d2 --- /dev/null +++ b/ui/src/app/rulechain/rulechain.routes.js @@ -0,0 +1,46 @@ +/* + * Copyright © 2016-2018 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. + */ +/* eslint-disable import/no-unresolved, import/default */ + +import ruleChainsTemplate from './rulechains.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleChainRoutes($stateProvider) { + + $stateProvider + .state('home.ruleChains', { + url: '/ruleChains', + params: {'topIndex': 0}, + module: 'private', + auth: ['SYS_ADMIN', 'TENANT_ADMIN'], + views: { + "content@home": { + templateUrl: ruleChainsTemplate, + controllerAs: 'vm', + controller: 'RuleChainController' + } + }, + data: { + searchEnabled: true, + pageTitle: 'rulechain.rulechains' + }, + ncyBreadcrumb: { + label: '{"icon": "settings_ethernet", "label": "rulechain.rulechains"}' + } + }); +} diff --git a/ui/src/app/rulechain/rulechains.tpl.html b/ui/src/app/rulechain/rulechains.tpl.html new file mode 100644 index 0000000000..a4fbd79a91 --- /dev/null +++ b/ui/src/app/rulechain/rulechains.tpl.html @@ -0,0 +1,75 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/src/app/services/menu.service.js b/ui/src/app/services/menu.service.js index 9dbddd9485..5d97ea6113 100644 --- a/ui/src/app/services/menu.service.js +++ b/ui/src/app/services/menu.service.js @@ -78,6 +78,12 @@ function Menu(userService, $state, $rootScope) { state: 'home.rules', icon: 'settings_ethernet' }, + { + name: 'rulechain.rulechains', + type: 'link', + state: 'home.ruleChains', + icon: 'settings_ethernet' + }, { name: 'tenant.tenants', type: 'link', @@ -127,6 +133,16 @@ function Menu(userService, $state, $rootScope) { } ] }, + { + name: 'rulechain.management', + places: [ + { + name: 'rulechain.rulechains', + icon: 'settings_ethernet', + state: 'home.ruleChains' + } + ] + }, { name: 'tenant.management', places: [ @@ -182,6 +198,12 @@ function Menu(userService, $state, $rootScope) { state: 'home.rules', icon: 'settings_ethernet' }, + { + name: 'rulechain.rulechains', + type: 'link', + state: 'home.ruleChains', + icon: 'settings_ethernet' + }, { name: 'customer.customers', type: 'link', @@ -235,6 +257,16 @@ function Menu(userService, $state, $rootScope) { } ] }, + { + name: 'rulechain.management', + places: [ + { + name: 'rulechain.rulechains', + icon: 'settings_ethernet', + state: 'home.ruleChains' + } + ] + }, { name: 'customer.management', places: [ From 7bc74a1c7d0757c778c65070a5cf8b7128021500 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Thu, 15 Mar 2018 11:34:16 +0200 Subject: [PATCH 04/75] count white&black list host requests for logging correct statistic --- .../quota/inmemory/HostRequestIntervalRegistry.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java b/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java index 8d254a08c6..3782ed22ed 100644 --- a/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java +++ b/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java @@ -61,13 +61,14 @@ public class HostRequestIntervalRegistry { } public long tick(String clientHostId) { + IntervalCount intervalCount = hostCounts.computeIfAbsent(clientHostId, s -> new IntervalCount(intervalDurationMs)); + long currentCount = intervalCount.resetIfExpiredAndTick(); if (whiteList.contains(clientHostId)) { return 0; } else if (blackList.contains(clientHostId)) { return Long.MAX_VALUE; } - IntervalCount intervalCount = hostCounts.computeIfAbsent(clientHostId, s -> new IntervalCount(intervalDurationMs)); - return intervalCount.resetIfExpiredAndTick(); + return currentCount; } public void clean() { From 00352231b1c0e90250dc991a6b5c2c68c403078d Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Thu, 15 Mar 2018 15:17:32 +0200 Subject: [PATCH 05/75] LifeCycle Events for RuleChainActor --- .../server/actors/app/AppActor.java | 64 ++++--------- .../actors/ruleChain/RuleChainActor.java | 59 ++++++++++++ .../RuleChainActorMessageProcessor.java | 93 +++++++++++++++++++ .../ruleChain/RuleChainManagerActor.java | 43 +++++++++ .../server/actors/service/ActorService.java | 9 +- .../actors/service/DefaultActorService.java | 25 ++--- .../actors/shared/EntityActorsManager.java | 68 ++++++++++++++ .../actors/shared/plugin/PluginManager.java | 57 +++--------- .../shared/plugin/SystemPluginManager.java | 4 +- .../shared/plugin/TenantPluginManager.java | 5 +- .../shared/rulechain/RuleChainManager.java | 30 ++++++ .../rulechain/SystemRuleChainManager.java | 47 ++++++++++ .../rulechain/TenantRuleChainManager.java | 58 ++++++++++++ .../server/actors/tenant/TenantActor.java | 87 +++++------------ .../server/controller/PluginController.java | 8 +- .../controller/RuleChainController.java | 7 ++ .../server/controller/RuleController.java | 8 +- .../common/data/page/PageDataIterable.java | 1 + .../server/common/msg/MsgType.java | 7 ++ .../server/common/msg/RuleMsg.java | 38 -------- .../server/common/msg/TbActorMsg.java | 10 ++ .../msg/plugin/ComponentLifecycleMsg.java | 42 ++++----- 22 files changed, 513 insertions(+), 257 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rulechain/SystemRuleChainManager.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java create mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java delete mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/RuleMsg.java create mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java diff --git a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java index b475277630..549d71d984 100644 --- a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -22,18 +22,15 @@ import akka.event.LoggingAdapter; import akka.japi.Function; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.plugin.PluginTerminationMsg; -import org.thingsboard.server.actors.service.ContextAwareActor; +import org.thingsboard.server.actors.ruleChain.RuleChainManagerActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.actors.shared.plugin.PluginManager; import org.thingsboard.server.actors.shared.plugin.SystemPluginManager; -import org.thingsboard.server.actors.shared.rule.RuleManager; -import org.thingsboard.server.actors.shared.rule.SystemRuleManager; -import org.thingsboard.server.actors.tenant.RuleChainDeviceMsg; +import org.thingsboard.server.actors.shared.rulechain.SystemRuleChainManager; import org.thingsboard.server.actors.tenant.TenantActor; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; +import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageDataIterable; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; @@ -43,27 +40,21 @@ import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginActorMsg; -import org.thingsboard.server.extensions.api.rules.ToRuleActorMsg; import scala.concurrent.duration.Duration; import java.util.HashMap; import java.util.Map; -import java.util.Optional; -public class AppActor extends ContextAwareActor { +public class AppActor extends RuleChainManagerActor { private final LoggingAdapter logger = Logging.getLogger(getContext().system(), this); public static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID); - private final RuleManager ruleManager; - private final PluginManager pluginManager; private final TenantService tenantService; private final Map tenantActors; private AppActor(ActorSystemContext systemContext) { - super(systemContext); - this.ruleManager = new SystemRuleManager(systemContext); - this.pluginManager = new SystemPluginManager(systemContext); + super(systemContext, new SystemRuleChainManager(systemContext), new SystemPluginManager(systemContext)); this.tenantService = systemContext.getTenantService(); this.tenantActors = new HashMap<>(); } @@ -77,8 +68,7 @@ public class AppActor extends ContextAwareActor { public void preStart() { logger.info("Starting main system actor."); try { - ruleManager.init(this.context()); - pluginManager.init(this.context()); + initRuleChains(); if (systemContext.isTenantComponentsInitEnabled()) { PageDataIterable tenantIterator = new PageDataIterable<>(tenantService::findTenants, ENTITY_PACK_LIMIT); @@ -102,8 +92,6 @@ public class AppActor extends ContextAwareActor { processDeviceMsg((ToDeviceActorMsg) msg); } else if (msg instanceof ToPluginActorMsg) { onToPluginMsg((ToPluginActorMsg) msg); - } else if (msg instanceof ToRuleActorMsg) { - onToRuleMsg((ToRuleActorMsg) msg); } else if (msg instanceof ToDeviceActorNotificationMsg) { onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); } else if (msg instanceof Terminated) { @@ -128,20 +116,10 @@ public class AppActor extends ContextAwareActor { tenantActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); } - private void onToRuleMsg(ToRuleActorMsg msg) { - ActorRef target; - if (SYSTEM_TENANT.equals(msg.getTenantId())) { - target = ruleManager.getOrCreateRuleActor(this.context(), msg.getRuleId()); - } else { - target = getOrCreateTenantActor(msg.getTenantId()); - } - target.tell(msg, ActorRef.noSender()); - } - private void onToPluginMsg(ToPluginActorMsg msg) { ActorRef target; if (SYSTEM_TENANT.equals(msg.getPluginTenantId())) { - target = pluginManager.getOrCreatePluginActor(this.context(), msg.getPluginId()); + target = pluginManager.getOrCreateActor(this.context(), msg.getPluginId()); } else { target = getOrCreateTenantActor(msg.getPluginTenantId()); } @@ -149,26 +127,16 @@ public class AppActor extends ContextAwareActor { } private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) { - ActorRef target = null; + ActorRef target; if (SYSTEM_TENANT.equals(msg.getTenantId())) { - Optional pluginId = msg.getPluginId(); - Optional ruleId = msg.getRuleId(); - if (pluginId.isPresent()) { - target = pluginManager.getOrCreatePluginActor(this.context(), pluginId.get()); - } else if (ruleId.isPresent()) { - Optional ref = ruleManager.update(this.context(), ruleId.get(), msg.getEvent()); - if (ref.isPresent()) { - target = ref.get(); - } else { - logger.debug("Failed to find actor for rule: [{}]", ruleId); - return; - } - } + target = getEntityActorRef(msg.getEntityId()); } else { target = getOrCreateTenantActor(msg.getTenantId()); } if (target != null) { target.tell(msg, ActorRef.noSender()); + } else { + logger.debug("Invalid component lifecycle msg: {}", msg); } } @@ -180,7 +148,7 @@ public class AppActor extends ContextAwareActor { TenantId tenantId = toDeviceActorMsg.getTenantId(); ActorRef tenantActor = getOrCreateTenantActor(tenantId); if (toDeviceActorMsg.getPayload().getMsgType().requiresRulesProcessing()) { - tenantActor.tell(new RuleChainDeviceMsg(toDeviceActorMsg, ruleManager.getRuleChain(this.context())), context().self()); +// tenantActor.tell(new RuleChainDeviceMsg(toDeviceActorMsg, ruleManager.getRuleChain(this.context())), context().self()); } else { tenantActor.tell(toDeviceActorMsg, context().self()); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java new file mode 100644 index 0000000000..83536f83da --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -0,0 +1,59 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; + +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.ComponentActor; +import org.thingsboard.server.actors.service.ContextBasedCreator; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; + +public class RuleChainActor extends ComponentActor { + + private RuleChainActor(ActorSystemContext systemContext, TenantId tenantId, RuleChainId ruleChainId) { + super(systemContext, tenantId, ruleChainId); + setProcessor(new RuleChainActorMessageProcessor(tenantId, ruleChainId, systemContext, + logger, context().parent(), context().self())); + } + + @Override + public void onReceive(Object msg) throws Exception { + logger.debug("[{}][{}] Unknown msg type.", tenantId, id, msg.getClass().getName()); + } + + public static class ActorCreator extends ContextBasedCreator { + private static final long serialVersionUID = 1L; + + private final TenantId tenantId; + private final RuleChainId ruleChainId; + + public ActorCreator(ActorSystemContext context, TenantId tenantId, RuleChainId pluginId) { + super(context); + this.tenantId = tenantId; + this.ruleChainId = pluginId; + } + + @Override + public RuleChainActor create() throws Exception { + return new RuleChainActor(context, tenantId, ruleChainId); + } + } + + @Override + protected long getErrorPersistFrequency() { + return systemContext.getPluginErrorPersistFrequency(); + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java new file mode 100644 index 0000000000..3075367863 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -0,0 +1,93 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; + +import akka.actor.ActorContext; +import akka.actor.ActorRef; +import akka.event.LoggingAdapter; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.plugin.*; +import org.thingsboard.server.actors.shared.ComponentMsgProcessor; +import org.thingsboard.server.common.data.id.PluginId; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.extensions.api.plugins.Plugin; +import org.thingsboard.server.extensions.api.plugins.PluginInitializationException; +import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; +import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; +import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; +import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; +import org.thingsboard.server.extensions.api.rules.RuleException; + +/** + * @author Andrew Shvayka + */ +public class RuleChainActorMessageProcessor extends ComponentMsgProcessor { + + private ComponentLifecycleState state; + + protected RuleChainActorMessageProcessor(TenantId tenantId, RuleChainId pluginId, ActorSystemContext systemContext + , LoggingAdapter logger, ActorRef parent, ActorRef self) { + super(systemContext, logger, tenantId, pluginId); + } + + @Override + public void start() throws Exception { + + } + + @Override + public void stop() throws Exception { + + } + + @Override + public void onCreated(ActorContext context) throws Exception { + + } + + @Override + public void onUpdate(ActorContext context) throws Exception { + + } + + @Override + public void onActivate(ActorContext context) throws Exception { + + } + + @Override + public void onSuspend(ActorContext context) throws Exception { + + } + + @Override + public void onStop(ActorContext context) throws Exception { + + } + + @Override + public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { + + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java new file mode 100644 index 0000000000..2dca8ddb0d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java @@ -0,0 +1,43 @@ +package org.thingsboard.server.actors.ruleChain; + +import akka.actor.ActorRef; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.ContextAwareActor; +import org.thingsboard.server.actors.shared.plugin.PluginManager; +import org.thingsboard.server.actors.shared.rulechain.RuleChainManager; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.PluginId; +import org.thingsboard.server.common.data.id.RuleChainId; + +/** + * Created by ashvayka on 15.03.18. + */ +public abstract class RuleChainManagerActor extends ContextAwareActor { + + protected final RuleChainManager ruleChainManager; + protected final PluginManager pluginManager; + + public RuleChainManagerActor(ActorSystemContext systemContext, RuleChainManager ruleChainManager, PluginManager pluginManager) { + super(systemContext); + this.ruleChainManager = ruleChainManager; + this.pluginManager = pluginManager; + } + + protected void initRuleChains() { + pluginManager.init(this.context()); + ruleChainManager.init(this.context()); + } + + protected ActorRef getEntityActorRef(EntityId entityId) { + ActorRef target = null; + switch (entityId.getEntityType()) { + case PLUGIN: + target = pluginManager.getOrCreateActor(this.context(), (PluginId) entityId); + break; + case RULE_CHAIN: + target = ruleChainManager.getOrCreateActor(this.context(), (RuleChainId) entityId); + break; + } + return target; + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java index baae376c64..0f66d256ed 100644 --- a/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java +++ b/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java @@ -15,10 +15,7 @@ */ package org.thingsboard.server.actors.service; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.transport.SessionMsgProcessor; import org.thingsboard.server.service.cluster.discovery.DiscoveryServiceListener; @@ -26,9 +23,7 @@ import org.thingsboard.server.service.cluster.rpc.RpcMsgListener; public interface ActorService extends SessionMsgProcessor, WebSocketMsgProcessor, RestMsgProcessor, RpcMsgListener, DiscoveryServiceListener { - void onPluginStateChange(TenantId tenantId, PluginId pluginId, ComponentLifecycleEvent state); - - void onRuleStateChange(TenantId tenantId, RuleId ruleId, ComponentLifecycleEvent state); + void onEntityStateChange(TenantId tenantId, EntityId entityId, ComponentLifecycleEvent state); void onCredentialsUpdate(TenantId tenantId, DeviceId deviceId); diff --git a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java index bb84a30229..7b6268760b 100644 --- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java +++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -30,10 +30,7 @@ import org.thingsboard.server.actors.rpc.RpcSessionCreateRequestMsg; import org.thingsboard.server.actors.rpc.RpcSessionTellMsg; import org.thingsboard.server.actors.session.SessionManagerActor; import org.thingsboard.server.actors.stats.StatsActor; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.msg.aware.SessionAwareMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; @@ -212,15 +209,9 @@ public class DefaultActorService implements ActorService { } @Override - public void onPluginStateChange(TenantId tenantId, PluginId pluginId, ComponentLifecycleEvent state) { - log.trace("[{}] Processing onPluginStateChange event: {}", pluginId, state); - broadcast(ComponentLifecycleMsg.forPlugin(tenantId, pluginId, state)); - } - - @Override - public void onRuleStateChange(TenantId tenantId, RuleId ruleId, ComponentLifecycleEvent state) { - log.trace("[{}] Processing onRuleStateChange event: {}", ruleId, state); - broadcast(ComponentLifecycleMsg.forRule(tenantId, ruleId, state)); + public void onEntityStateChange(TenantId tenantId, EntityId entityId, ComponentLifecycleEvent state) { + log.trace("[{}] Processing {} state change event: {}", tenantId, entityId.getEntityType(), state); + broadcast(new ComponentLifecycleMsg(tenantId, entityId, state)); } @Override diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java new file mode 100644 index 0000000000..a98609ceee --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java @@ -0,0 +1,68 @@ +package org.thingsboard.server.actors.shared; + +import akka.actor.ActorContext; +import akka.actor.ActorRef; +import akka.actor.Props; +import akka.actor.UntypedActor; +import akka.japi.Creator; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.ContextAwareActor; +import org.thingsboard.server.common.data.SearchTextBased; +import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UUIDBased; +import org.thingsboard.server.common.data.page.PageDataIterable; +import org.thingsboard.server.common.data.plugin.PluginMetaData; + +import java.util.HashMap; +import java.util.Map; + +/** + * Created by ashvayka on 15.03.18. + */ +@Slf4j +public abstract class EntityActorsManager> { + + protected final ActorSystemContext systemContext; + protected final Map actors; + + public EntityActorsManager(ActorSystemContext systemContext) { + this.systemContext = systemContext; + this.actors = new HashMap<>(); + } + + protected abstract TenantId getTenantId(); + + protected abstract String getDispatcherName(); + + protected abstract Creator creator(T entityId); + + protected abstract PageDataIterable.FetchFunction getFetchEntitiesFunction(); + + public void init(ActorContext context) { + for (M entity : new PageDataIterable<>(getFetchEntitiesFunction(), ContextAwareActor.ENTITY_PACK_LIMIT)) { + log.debug("[{}] Creating plugin actor", entity.getId()); + //TODO: remove this cast making UUIDBased subclass of EntityId an interface and vice versa. + getOrCreateActor(context, (T) entity.getId()); + log.debug("[{}] Plugin actor created.", entity.getId()); + } + } + + + public ActorRef getOrCreateActor(ActorContext context, T entityId) { + return actors.computeIfAbsent(entityId, eId -> + context.actorOf(Props.create(creator(eId)) + .withDispatcher(getDispatcherName()), eId.toString())); + } + + public void broadcast(Object msg) { + actors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); + } + + public void remove(T id) { + actors.remove(id); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java index 4f5871f585..5142de2c15 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,63 +15,28 @@ */ package org.thingsboard.server.actors.shared.plugin; -import akka.actor.ActorContext; -import akka.actor.ActorRef; -import akka.actor.Props; +import akka.japi.Creator; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.plugin.PluginActor; -import org.thingsboard.server.actors.service.ContextAwareActor; +import org.thingsboard.server.actors.shared.EntityActorsManager; import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.PageDataIterable; -import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.dao.plugin.PluginService; -import java.util.HashMap; -import java.util.Map; - @Slf4j -public abstract class PluginManager { +public abstract class PluginManager extends EntityActorsManager { - protected final ActorSystemContext systemContext; protected final PluginService pluginService; - protected final Map pluginActors; public PluginManager(ActorSystemContext systemContext) { - this.systemContext = systemContext; + super(systemContext); this.pluginService = systemContext.getPluginService(); - this.pluginActors = new HashMap<>(); } - public void init(ActorContext context) { - PageDataIterable pluginIterator = new PageDataIterable<>(getFetchPluginsFunction(), - ContextAwareActor.ENTITY_PACK_LIMIT); - for (PluginMetaData plugin : pluginIterator) { - log.debug("[{}] Creating plugin actor", plugin.getId()); - getOrCreatePluginActor(context, plugin.getId()); - log.debug("Plugin actor created."); - } + @Override + public Creator creator(PluginId entityId){ + return new PluginActor.ActorCreator(systemContext, getTenantId(), entityId); } - abstract FetchFunction getFetchPluginsFunction(); - - abstract TenantId getTenantId(); - - abstract String getDispatcherName(); - - public ActorRef getOrCreatePluginActor(ActorContext context, PluginId pluginId) { - return pluginActors.computeIfAbsent(pluginId, pId -> - context.actorOf(Props.create(new PluginActor.ActorCreator(systemContext, getTenantId(), pId)) - .withDispatcher(getDispatcherName()), pId.toString())); - } - - public void broadcast(Object msg) { - pluginActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); - } - - public void remove(PluginId id) { - pluginActors.remove(id); - } } diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/SystemPluginManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/SystemPluginManager.java index 0888e23f25..88c52a6043 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/SystemPluginManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/SystemPluginManager.java @@ -29,12 +29,12 @@ public class SystemPluginManager extends PluginManager { } @Override - FetchFunction getFetchPluginsFunction() { + protected FetchFunction getFetchEntitiesFunction() { return pluginService::findSystemPlugins; } @Override - TenantId getTenantId() { + protected TenantId getTenantId() { return BasePluginService.SYSTEM_TENANT; } diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/TenantPluginManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/TenantPluginManager.java index 14ea2aa7f8..09115f0f7d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/TenantPluginManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/TenantPluginManager.java @@ -19,6 +19,7 @@ import akka.actor.ActorContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.PageDataIterable; import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; import org.thingsboard.server.common.data.plugin.PluginMetaData; @@ -39,12 +40,12 @@ public class TenantPluginManager extends PluginManager { } @Override - FetchFunction getFetchPluginsFunction() { + protected FetchFunction getFetchEntitiesFunction() { return link -> pluginService.findTenantPlugins(tenantId, link); } @Override - TenantId getTenantId() { + protected TenantId getTenantId() { return tenantId; } diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java new file mode 100644 index 0000000000..09396110b4 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java @@ -0,0 +1,30 @@ +package org.thingsboard.server.actors.shared.rulechain; + +import akka.japi.Creator; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.ruleChain.RuleChainActor; +import org.thingsboard.server.actors.shared.EntityActorsManager; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.dao.rule.RuleChainService; + +/** + * Created by ashvayka on 15.03.18. + */ +@Slf4j +public abstract class RuleChainManager extends EntityActorsManager { + + protected final RuleChainService service; + + public RuleChainManager(ActorSystemContext systemContext) { + super(systemContext); + this.service = systemContext.getRuleChainService(); + } + + @Override + public Creator creator(RuleChainId entityId) { + return new RuleChainActor.ActorCreator(systemContext, getTenantId(), entityId); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/SystemRuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/SystemRuleChainManager.java new file mode 100644 index 0000000000..a8bb069685 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/SystemRuleChainManager.java @@ -0,0 +1,47 @@ +/** + * Copyright © 2016-2018 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.actors.shared.rulechain; + +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.DefaultActorService; +import org.thingsboard.server.actors.shared.plugin.PluginManager; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; +import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.dao.plugin.BasePluginService; + +public class SystemRuleChainManager extends RuleChainManager { + + public SystemRuleChainManager(ActorSystemContext systemContext) { + super(systemContext); + } + + @Override + protected FetchFunction getFetchEntitiesFunction() { + return service::findSystemRuleChains; + } + + @Override + protected TenantId getTenantId() { + return BasePluginService.SYSTEM_TENANT; + } + + @Override + protected String getDispatcherName() { + return DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME; + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java new file mode 100644 index 0000000000..aa2a63104a --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java @@ -0,0 +1,58 @@ +/** + * Copyright © 2016-2018 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.actors.shared.rulechain; + +import akka.actor.ActorContext; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.DefaultActorService; +import org.thingsboard.server.actors.shared.rule.RuleManager; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.PageDataIterable; +import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleMetaData; + +public class TenantRuleChainManager extends RuleChainManager { + + private final TenantId tenantId; + + public TenantRuleChainManager(ActorSystemContext systemContext, TenantId tenantId) { + super(systemContext); + this.tenantId = tenantId; + } + + @Override + public void init(ActorContext context) { + if (systemContext.isTenantComponentsInitEnabled()) { + super.init(context); + } + } + + @Override + protected TenantId getTenantId() { + return tenantId; + } + + @Override + protected String getDispatcherName() { + return DefaultActorService.TENANT_RULE_DISPATCHER_NAME; + } + + @Override + protected FetchFunction getFetchEntitiesFunction() { + return link -> service.findTenantRuleChains(tenantId, link); + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java index b923fe15a3..86211794bf 100644 --- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,52 +15,38 @@ */ package org.thingsboard.server.actors.tenant; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; - +import akka.actor.ActorRef; +import akka.actor.Props; +import akka.event.Logging; +import akka.event.LoggingAdapter; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.device.DeviceActor; import org.thingsboard.server.actors.plugin.PluginTerminationMsg; -import org.thingsboard.server.actors.rule.ComplexRuleActorChain; -import org.thingsboard.server.actors.rule.RuleActorChain; -import org.thingsboard.server.actors.service.ContextAwareActor; +import org.thingsboard.server.actors.ruleChain.RuleChainManagerActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.actors.shared.plugin.PluginManager; import org.thingsboard.server.actors.shared.plugin.TenantPluginManager; -import org.thingsboard.server.actors.shared.rule.RuleManager; -import org.thingsboard.server.actors.shared.rule.TenantRuleManager; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.actors.shared.rulechain.TenantRuleChainManager; +import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; - -import akka.actor.ActorRef; -import akka.actor.Props; -import akka.event.Logging; -import akka.event.LoggingAdapter; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginActorMsg; -import org.thingsboard.server.extensions.api.rules.ToRuleActorMsg; -public class TenantActor extends ContextAwareActor { +import java.util.HashMap; +import java.util.Map; + +public class TenantActor extends RuleChainManagerActor { private final LoggingAdapter logger = Logging.getLogger(getContext().system(), this); private final TenantId tenantId; - private final RuleManager ruleManager; - private final PluginManager pluginManager; private final Map deviceActors; private TenantActor(ActorSystemContext systemContext, TenantId tenantId) { - super(systemContext); + super(systemContext, new TenantRuleChainManager(systemContext, tenantId), new TenantPluginManager(systemContext, tenantId)); this.tenantId = tenantId; - this.ruleManager = new TenantRuleManager(systemContext, tenantId); - this.pluginManager = new TenantPluginManager(systemContext, tenantId); this.deviceActors = new HashMap<>(); } @@ -68,8 +54,7 @@ public class TenantActor extends ContextAwareActor { public void preStart() { logger.info("[{}] Starting tenant actor.", tenantId); try { - ruleManager.init(this.context()); - pluginManager.init(this.context()); + initRuleChains(); logger.info("[{}] Tenant actor started.", tenantId); } catch (Exception e) { logger.error(e, "[{}] Unknown failure", tenantId); @@ -79,14 +64,10 @@ public class TenantActor extends ContextAwareActor { @Override public void onReceive(Object msg) throws Exception { logger.debug("[{}] Received message: {}", tenantId, msg); - if (msg instanceof RuleChainDeviceMsg) { - process((RuleChainDeviceMsg) msg); - } else if (msg instanceof ToDeviceActorMsg) { + if (msg instanceof ToDeviceActorMsg) { onToDeviceActorMsg((ToDeviceActorMsg) msg); } else if (msg instanceof ToPluginActorMsg) { onToPluginMsg((ToPluginActorMsg) msg); - } else if (msg instanceof ToRuleActorMsg) { - onToRuleMsg((ToRuleActorMsg) msg); } else if (msg instanceof ToDeviceActorNotificationMsg) { onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); } else if (msg instanceof ClusterEventMsg) { @@ -113,14 +94,9 @@ public class TenantActor extends ContextAwareActor { getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender()); } - private void onToRuleMsg(ToRuleActorMsg msg) { - ActorRef target = ruleManager.getOrCreateRuleActor(this.context(), msg.getRuleId()); - target.tell(msg, ActorRef.noSender()); - } - private void onToPluginMsg(ToPluginActorMsg msg) { if (msg.getPluginTenantId().equals(tenantId)) { - ActorRef pluginActor = pluginManager.getOrCreatePluginActor(this.context(), msg.getPluginId()); + ActorRef pluginActor = pluginManager.getOrCreateActor(this.context(), msg.getPluginId()); pluginActor.tell(msg, ActorRef.noSender()); } else { context().parent().tell(msg, ActorRef.noSender()); @@ -128,23 +104,11 @@ public class TenantActor extends ContextAwareActor { } private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) { - Optional pluginId = msg.getPluginId(); - Optional ruleId = msg.getRuleId(); - if (pluginId.isPresent()) { - ActorRef pluginActor = pluginManager.getOrCreatePluginActor(this.context(), pluginId.get()); - pluginActor.tell(msg, ActorRef.noSender()); - } else if (ruleId.isPresent()) { - ActorRef target; - Optional ref = ruleManager.update(this.context(), ruleId.get(), msg.getEvent()); - if (ref.isPresent()) { - target = ref.get(); - } else { - logger.debug("Failed to find actor for rule: [{}]", ruleId); - return; - } + ActorRef target = getEntityActorRef(msg.getEntityId()); + if (target != null) { target.tell(msg, ActorRef.noSender()); } else { - logger.debug("[{}] Invalid component lifecycle msg.", tenantId); + logger.debug("Invalid component lifecycle msg: {}", msg); } } @@ -152,13 +116,6 @@ public class TenantActor extends ContextAwareActor { pluginManager.remove(msg.getId()); } - private void process(RuleChainDeviceMsg msg) { - ToDeviceActorMsg toDeviceActorMsg = msg.getToDeviceActorMsg(); - ActorRef deviceActor = getOrCreateDeviceActor(toDeviceActorMsg.getDeviceId()); - RuleActorChain tenantChain = ruleManager.getRuleChain(this.context()); - RuleActorChain chain = new ComplexRuleActorChain(msg.getRuleChain(), tenantChain); - deviceActor.tell(new RuleChainDeviceMsg(toDeviceActorMsg, chain), context().self()); - } private ActorRef getOrCreateDeviceActor(DeviceId deviceId) { return deviceActors.computeIfAbsent(deviceId, k -> context().actorOf(Props.create(new DeviceActor.ActorCreator(systemContext, tenantId, deviceId)) diff --git a/application/src/main/java/org/thingsboard/server/controller/PluginController.java b/application/src/main/java/org/thingsboard/server/controller/PluginController.java index 2c69248faa..ed1760057b 100644 --- a/application/src/main/java/org/thingsboard/server/controller/PluginController.java +++ b/application/src/main/java/org/thingsboard/server/controller/PluginController.java @@ -71,7 +71,7 @@ public class PluginController extends BaseController { boolean created = source.getId() == null; source.setTenantId(getCurrentUser().getTenantId()); PluginMetaData plugin = checkNotNull(pluginService.savePlugin(source)); - actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), + actorService.onEntityStateChange(plugin.getTenantId(), plugin.getId(), created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED); logEntityAction(plugin.getId(), plugin, @@ -97,7 +97,7 @@ public class PluginController extends BaseController { PluginId pluginId = new PluginId(toUUID(strPluginId)); PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId)); pluginService.activatePluginById(pluginId); - actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.ACTIVATED); + actorService.onEntityStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.ACTIVATED); logEntityAction(plugin.getId(), plugin, null, @@ -123,7 +123,7 @@ public class PluginController extends BaseController { PluginId pluginId = new PluginId(toUUID(strPluginId)); PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId)); pluginService.suspendPluginById(pluginId); - actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.SUSPENDED); + actorService.onEntityStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.SUSPENDED); logEntityAction(plugin.getId(), plugin, null, @@ -221,7 +221,7 @@ public class PluginController extends BaseController { PluginId pluginId = new PluginId(toUUID(strPluginId)); PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId)); pluginService.deletePluginById(pluginId); - actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.DELETED); + actorService.onEntityStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.DELETED); logEntityAction(pluginId, plugin, null, diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index f24646b56f..93891ac53a 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -78,6 +78,9 @@ public class RuleChainController extends BaseController { ruleChain.setTenantId(getCurrentUser().getTenantId()); RuleChain savedRuleChain = checkNotNull(ruleChainService.saveRuleChain(ruleChain)); + actorService.onEntityStateChange(ruleChain.getTenantId(), ruleChain.getId(), + created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED); + logEntityAction(savedRuleChain.getId(), savedRuleChain, null, created ? ActionType.ADDED : ActionType.UPDATED, null); @@ -100,6 +103,8 @@ public class RuleChainController extends BaseController { RuleChain ruleChain = checkRuleChain(ruleChainMetaData.getRuleChainId()); RuleChainMetaData savedRuleChainMetaData = checkNotNull(ruleChainService.saveRuleChainMetaData(ruleChainMetaData)); + actorService.onEntityStateChange(ruleChain.getTenantId(), ruleChain.getId(), ComponentLifecycleEvent.UPDATED); + logEntityAction(ruleChain.getId(), ruleChain, null, ActionType.UPDATED, null, ruleChainMetaData); @@ -183,6 +188,8 @@ public class RuleChainController extends BaseController { RuleChain ruleChain = checkRuleChain(ruleChainId); ruleChainService.deleteRuleChainById(ruleChainId); + actorService.onEntityStateChange(ruleChain.getTenantId(), ruleChain.getId(), ComponentLifecycleEvent.DELETED); + logEntityAction(ruleChainId, ruleChain, null, ActionType.DELETED, null, strRuleChainId); diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleController.java b/application/src/main/java/org/thingsboard/server/controller/RuleController.java index e498c8fffc..9a269029b5 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleController.java @@ -73,7 +73,7 @@ public class RuleController extends BaseController { boolean created = source.getId() == null; source.setTenantId(getCurrentUser().getTenantId()); RuleMetaData rule = checkNotNull(ruleService.saveRule(source)); - actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), + actorService.onEntityStateChange(rule.getTenantId(), rule.getId(), created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED); logEntityAction(rule.getId(), rule, @@ -99,7 +99,7 @@ public class RuleController extends BaseController { RuleId ruleId = new RuleId(toUUID(strRuleId)); RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId)); ruleService.activateRuleById(ruleId); - actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.ACTIVATED); + actorService.onEntityStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.ACTIVATED); logEntityAction(rule.getId(), rule, null, @@ -125,7 +125,7 @@ public class RuleController extends BaseController { RuleId ruleId = new RuleId(toUUID(strRuleId)); RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId)); ruleService.suspendRuleById(ruleId); - actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.SUSPENDED); + actorService.onEntityStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.SUSPENDED); logEntityAction(rule.getId(), rule, null, @@ -219,7 +219,7 @@ public class RuleController extends BaseController { RuleId ruleId = new RuleId(toUUID(strRuleId)); RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId)); ruleService.deleteRuleById(ruleId); - actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.DELETED); + actorService.onEntityStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.DELETED); logEntityAction(ruleId, rule, null, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageDataIterable.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageDataIterable.java index 34f8c3aed6..ffd78225c4 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageDataIterable.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageDataIterable.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.NoSuchElementException; import org.thingsboard.server.common.data.SearchTextBased; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.UUIDBased; public class PageDataIterable> implements Iterable, Iterator { diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java new file mode 100644 index 0000000000..55c131d12d --- /dev/null +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java @@ -0,0 +1,7 @@ +package org.thingsboard.server.common.msg; + +/** + * Created by ashvayka on 15.03.18. + */ +public enum MsgType { +} diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/RuleMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/RuleMsg.java deleted file mode 100644 index ee352ad722..0000000000 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/RuleMsg.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright © 2016-2018 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.msg; - -import org.thingsboard.server.common.data.rule.Scope; -import org.thingsboard.server.common.data.rule.RuleType; -import org.thingsboard.server.common.msg.aware.RuleAwareMsg; - -/** - * Message that is used to deliver some data to the rule instance. - * For example: aggregated statistics or command decoded from http request. - * - * @author ashvayka - * - * @param - payload - */ -public interface RuleMsg extends RuleAwareMsg { - - Scope getRuleLevel(); - - RuleType getRuleType(); - - V getPayload(); - -} diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java new file mode 100644 index 0000000000..e7668ff227 --- /dev/null +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java @@ -0,0 +1,10 @@ +package org.thingsboard.server.common.msg; + +/** + * Created by ashvayka on 15.03.18. + */ +public interface TbActorMsg { + + MsgType getMsgType(); + +} diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java index d48c3feb10..b77722e826 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,14 +15,12 @@ */ package org.thingsboard.server.common.msg.plugin; -import lombok.Data; import lombok.Getter; import lombok.ToString; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; +import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.msg.aware.TenantAwareMsg; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; @@ -35,31 +33,27 @@ import java.util.Optional; public class ComponentLifecycleMsg implements TenantAwareMsg, ToAllNodesMsg { @Getter private final TenantId tenantId; - private final PluginId pluginId; - private final RuleId ruleId; + @Getter + private final EntityId entityId; @Getter private final ComponentLifecycleEvent event; - public static ComponentLifecycleMsg forPlugin(TenantId tenantId, PluginId pluginId, ComponentLifecycleEvent event) { - return new ComponentLifecycleMsg(tenantId, pluginId, null, event); - } - - public static ComponentLifecycleMsg forRule(TenantId tenantId, RuleId ruleId, ComponentLifecycleEvent event) { - return new ComponentLifecycleMsg(tenantId, null, ruleId, event); - } - - private ComponentLifecycleMsg(TenantId tenantId, PluginId pluginId, RuleId ruleId, ComponentLifecycleEvent event) { + public ComponentLifecycleMsg(TenantId tenantId, EntityId entityId, ComponentLifecycleEvent event) { this.tenantId = tenantId; - this.pluginId = pluginId; - this.ruleId = ruleId; + this.entityId = entityId; this.event = event; } public Optional getPluginId() { - return Optional.ofNullable(pluginId); + return entityId.getEntityType() == EntityType.PLUGIN ? Optional.of((PluginId) entityId) : Optional.empty(); } public Optional getRuleId() { - return Optional.ofNullable(ruleId); + return entityId.getEntityType() == EntityType.RULE ? Optional.of((RuleId) entityId) : Optional.empty(); + } + + public Optional getRuleChainId() { + return entityId.getEntityType() == EntityType.RULE_CHAIN ? Optional.of((RuleChainId) entityId) : Optional.empty(); } + } From edf24f5d6b3fd87257cfe3e35ad0da4fc2451c8a Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Fri, 16 Mar 2018 19:26:59 +0200 Subject: [PATCH 06/75] Enrich Rule Node with Tenant/Customer/Self attributes --- .../server/common/data/Customer.java | 2 +- .../server/common/data/Device.java | 2 +- .../server/common/data/HasCustomerId.java | 23 +++++++ .../server/common/data/HasTenantId.java | 23 +++++++ .../thingsboard/server/common/data/User.java | 2 +- .../server/common/data/alarm/Alarm.java | 3 +- .../server/common/data/asset/Asset.java | 7 +- .../common/data/plugin/PluginMetaData.java | 3 +- .../server/common/data/rule/RuleChain.java | 3 +- .../server/common/data/rule/RuleMetaData.java | 3 +- .../rule/engine/api/TbContext.java | 26 ++++++++ .../rule/engine/api/TbNodeException.java | 4 ++ .../thingsboard/rule/engine/DonAsynchron.java | 40 +++++++++++ .../engine/metadata/TbEntityGetAttrNode.java | 66 +++++++++++++++++++ .../engine/metadata/TbGetAttributesNode.java | 41 ++++++------ .../metadata/TbGetCustomerAttributeNode.java | 49 ++++++++++++++ .../TbGetEntityAttrNodeConfiguration.java | 27 ++++++++ .../metadata/TbGetTenantAttributeNode.java | 62 +++++++++++++++++ .../TbGetCustomerAttributeNodeTest.java | 44 +++++++++++++ 19 files changed, 399 insertions(+), 31 deletions(-) create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/HasCustomerId.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/HasTenantId.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java index 03115a9940..078c97b1c0 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId; import com.fasterxml.jackson.databind.JsonNode; -public class Customer extends ContactBased implements HasName { +public class Customer extends ContactBased implements HasName, HasTenantId { private static final long serialVersionUID = -1599722990298929275L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java index 13fa011d9d..95662c1292 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId; import com.fasterxml.jackson.databind.JsonNode; @EqualsAndHashCode(callSuper = true) -public class Device extends SearchTextBasedWithAdditionalInfo implements HasName { +public class Device extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId, HasCustomerId { private static final long serialVersionUID = 2807343040519543363L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HasCustomerId.java b/common/data/src/main/java/org/thingsboard/server/common/data/HasCustomerId.java new file mode 100644 index 0000000000..e89eba8bbb --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/HasCustomerId.java @@ -0,0 +1,23 @@ +/** + * Copyright © 2016-2018 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.thingsboard.server.common.data.id.CustomerId; + +public interface HasCustomerId { + + CustomerId getCustomerId(); +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HasTenantId.java b/common/data/src/main/java/org/thingsboard/server/common/data/HasTenantId.java new file mode 100644 index 0000000000..ebba003cc8 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/HasTenantId.java @@ -0,0 +1,23 @@ +/** + * Copyright © 2016-2018 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.thingsboard.server.common.data.id.TenantId; + +public interface HasTenantId { + + TenantId getTenantId(); +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java index c893d644d9..3b957764fc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.security.Authority; import com.fasterxml.jackson.databind.JsonNode; @EqualsAndHashCode(callSuper = true) -public class User extends SearchTextBasedWithAdditionalInfo implements HasName { +public class User extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId, HasCustomerId { private static final long serialVersionUID = 8250339805336035966L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java index 70f5042a75..125406c4a1 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java @@ -22,6 +22,7 @@ import lombok.Builder; import lombok.Data; import org.thingsboard.server.common.data.BaseData; import org.thingsboard.server.common.data.HasName; +import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; @@ -31,7 +32,7 @@ import org.thingsboard.server.common.data.id.TenantId; @Data @Builder @AllArgsConstructor -public class Alarm extends BaseData implements HasName { +public class Alarm extends BaseData implements HasName, HasTenantId { private TenantId tenantId; private String type; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java index cc3c111724..c7b246c1ee 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java @@ -17,16 +17,13 @@ package org.thingsboard.server.common.data.asset; import com.fasterxml.jackson.databind.JsonNode; import lombok.EqualsAndHashCode; -import org.thingsboard.server.common.data.HasAdditionalInfo; -import org.thingsboard.server.common.data.HasName; -import org.thingsboard.server.common.data.SearchTextBased; -import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; +import org.thingsboard.server.common.data.*; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; @EqualsAndHashCode(callSuper = true) -public class Asset extends SearchTextBasedWithAdditionalInfo implements HasName { +public class Asset extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId, HasCustomerId { private static final long serialVersionUID = 2807343040519543363L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/PluginMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/PluginMetaData.java index 8576264d5b..4c33ffe65c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/PluginMetaData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/PluginMetaData.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.HasName; +import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; @@ -32,7 +33,7 @@ import java.io.IOException; @EqualsAndHashCode(callSuper = true) @Slf4j -public class PluginMetaData extends SearchTextBasedWithAdditionalInfo implements HasName { +public class PluginMetaData extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId { private static final long serialVersionUID = 1L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java index e82c850b9d..f2ba0cc66e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java @@ -21,6 +21,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.HasName; +import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; @@ -29,7 +30,7 @@ import org.thingsboard.server.common.data.id.TenantId; @Data @EqualsAndHashCode(callSuper = true) @Slf4j -public class RuleChain extends SearchTextBasedWithAdditionalInfo implements HasName { +public class RuleChain extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId { private static final long serialVersionUID = -5656679015121935465L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java index 98adeb7742..953e5eb6bc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java @@ -23,6 +23,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.HasName; +import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; @@ -31,7 +32,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; @Data @EqualsAndHashCode(callSuper = true) @Slf4j -public class RuleMetaData extends SearchTextBasedWithAdditionalInfo implements HasName { +public class RuleMetaData extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId { private static final long serialVersionUID = -5656679015122935465L; diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 07cd72c001..e852500808 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -17,7 +17,15 @@ package org.thingsboard.rule.engine.api; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.dao.alarm.AlarmService; +import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.customer.CustomerService; +import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.plugin.PluginService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.dao.rule.RuleService; +import org.thingsboard.server.dao.user.UserService; import java.util.UUID; @@ -40,6 +48,24 @@ public interface TbContext { void ack(UUID msg); + void tellError(TbMsg msg, Throwable th); + AttributesService getAttributesService(); + CustomerService getCustomerService(); + + UserService getUserService(); + + RuleService getRuleService(); + + PluginService getPluginService(); + + AssetService getAssetService(); + + DeviceService getDeviceService(); + + AlarmService getAlarmService(); + + RuleChainService getRuleChainService(); + } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeException.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeException.java index 6766999d50..b42ec8ec13 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeException.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeException.java @@ -22,6 +22,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; */ public class TbNodeException extends Exception { + public TbNodeException(String message) { + super(message); + } + public TbNodeException(Exception e) { super(e); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java new file mode 100644 index 0000000000..18ad3949cf --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2018 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.rule.engine; + +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; + +import javax.annotation.Nullable; +import java.util.function.Consumer; + +public class DonAsynchron { + + public static void withCallback(ListenableFuture future, Consumer onSuccess, Consumer onFailure) { + Futures.addCallback(future, new FutureCallback() { + @Override + public void onSuccess(@Nullable T result) { + onSuccess.accept(result); + } + + @Override + public void onFailure(Throwable t) { + onFailure.accept(t); + } + }); + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java new file mode 100644 index 0000000000..834daa1041 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -0,0 +1,66 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; + +import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.msg.TbMsg; + +import java.util.List; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; +import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE; + +public abstract class TbEntityGetAttrNode implements TbNode { + + private TbGetEntityAttrNodeConfiguration config; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + withCallback( + findEntityAsync(ctx, msg.getOriginator()), + entityId -> withCallback( + ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()), + attributes -> putAttributesAndTell(ctx, msg, attributes), + t -> ctx.tellError(msg, t) + ), + t -> ctx.tellError(msg, t)); + } + + private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { + attributes.forEach(r -> { + String attrName = config.getAttrMapping().get(r.getKey()); + msg.getMetaData().putValue(attrName, r.getValueAsString()); + }); + ctx.tellNext(msg); + } + + @Override + public void destroy() { + + } + + protected abstract ListenableFuture findEntityAsync(TbContext ctx, EntityId originator); + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 11c644c429..34357ee3b2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -15,23 +15,27 @@ */ package org.thingsboard.rule.engine.metadata; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; -import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.msg.TbMsg; -import org.thingsboard.server.dao.attributes.AttributesService; import java.util.List; +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; +import static org.thingsboard.server.common.data.DataConstants.*; + /** * Created by ashvayka on 19.01.18. */ @Slf4j public class TbGetAttributesNode implements TbNode { - TbGetAttributesNodeConfiguration config; + private TbGetAttributesNodeConfiguration config; @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { @@ -40,26 +44,25 @@ public class TbGetAttributesNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException { - try { - //TODO: refactor this to work async and fetch attributes from cache. - AttributesService service = ctx.getAttributesService(); - fetchAttributes(msg, service, config.getClientAttributeNames(), DataConstants.CLIENT_SCOPE, "cs."); - fetchAttributes(msg, service, config.getServerAttributeNames(), DataConstants.SERVER_SCOPE, "ss."); - fetchAttributes(msg, service, config.getSharedAttributeNames(), DataConstants.SHARED_SCOPE, "shared."); - ctx.tellNext(msg); - } catch (Exception e) { - log.warn("[{}][{}] Failed to fetch attributes", msg.getOriginator(), msg.getId(), e); - throw new TbNodeException(e); - } + ListenableFuture> future = Futures.successfulAsList( + putAttrAsync(ctx, msg, CLIENT_SCOPE, config.getClientAttributeNames(), "cs."), + putAttrAsync(ctx, msg, SHARED_SCOPE, config.getSharedAttributeNames(), "shared."), + putAttrAsync(ctx, msg, SERVER_SCOPE, config.getServerAttributeNames(), "ss.")); + + withCallback(future, i -> ctx.tellNext(msg), t -> ctx.tellError(msg, t)); } - private void fetchAttributes(TbMsg msg, AttributesService service, List attributeNames, String scope, String prefix) throws InterruptedException, java.util.concurrent.ExecutionException { - if (attributeNames != null && attributeNames.isEmpty()) { - List attributes = service.find(msg.getOriginator(), scope, attributeNames).get(); - attributes.forEach(attr -> msg.getMetaData().putValue(prefix + attr.getKey(), attr.getValueAsString())); - } + private ListenableFuture putAttributesAsync(TbMsg msg, List attributes, String prefix) { + attributes.forEach(r -> msg.getMetaData().putValue(prefix + r.getKey(), r.getValueAsString())); + return Futures.immediateFuture(null); } + private ListenableFuture putAttrAsync(TbContext ctx, TbMsg msg, String scope, List attributes, String prefix) { + return Futures.transform(ctx.getAttributesService().find(msg.getOriginator(), scope, attributes), + (AsyncFunction, Void>) i -> putAttributesAsync(msg, i, prefix)); + } + + @Override public void destroy() { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java new file mode 100644 index 0000000000..a138886f9a --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -0,0 +1,49 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.HasCustomerId; +import org.thingsboard.server.common.data.id.*; + +public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { + + @Override + protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { + + switch (originator.getEntityType()) { + case CUSTOMER: + return Futures.immediateFuture((CustomerId) originator); + case USER: + return getCustomerAsync(ctx.getUserService().findUserByIdAsync((UserId) originator)); + case ASSET: + return getCustomerAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) originator)); + case DEVICE: + return getCustomerAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) originator)); + default: + return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType " + originator)); + } + } + + private ListenableFuture getCustomerAsync(ListenableFuture future) { + return Futures.transform(future, (AsyncFunction) in -> Futures.immediateFuture(in.getCustomerId())); + } + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java new file mode 100644 index 0000000000..bd53e83c07 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java @@ -0,0 +1,27 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; + +import lombok.Data; + +import java.util.Map; +import java.util.Optional; + +@Data +public class TbGetEntityAttrNodeConfiguration { + + private Map attrMapping; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java new file mode 100644 index 0000000000..eaa61eac04 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -0,0 +1,62 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.HasTenantId; +import org.thingsboard.server.common.data.alarm.AlarmId; +import org.thingsboard.server.common.data.id.*; + +@Slf4j +public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { + + @Override + protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { + + switch (originator.getEntityType()) { + case TENANT: + return Futures.immediateFuture((TenantId) originator); + case CUSTOMER: + return getTenantAsync(ctx.getCustomerService().findCustomerByIdAsync((CustomerId) originator)); + case USER: + return getTenantAsync(ctx.getUserService().findUserByIdAsync((UserId) originator)); + case RULE: + return getTenantAsync(ctx.getRuleService().findRuleByIdAsync((RuleId) originator)); + case PLUGIN: + return getTenantAsync(ctx.getPluginService().findPluginByIdAsync((PluginId) originator)); + case ASSET: + return getTenantAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) originator)); + case DEVICE: + return getTenantAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) originator)); + case ALARM: + return getTenantAsync(ctx.getAlarmService().findAlarmByIdAsync((AlarmId) originator)); + case RULE_CHAIN: + return getTenantAsync(ctx.getRuleChainService().findRuleChainByIdAsync((RuleChainId) originator)); + default: + return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType " + originator)); + } + } + + private ListenableFuture getTenantAsync(ListenableFuture future) { + return Futures.transform(future, (AsyncFunction) in -> Futures.immediateFuture(in.getTenantId())); + } + +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java new file mode 100644 index 0000000000..5daf619bba --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -0,0 +1,44 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.server.common.msg.TbMsg; + +import static org.junit.Assert.*; + +@RunWith(MockitoJUnitRunner.class) +public class TbGetCustomerAttributeNodeTest { + + //todo-vp: return to this after fixing compilation problem with protobuff +// private TbGetCustomerAttributeNode node; +// +// @Mock +// private TbContext ctx; +// +// private TbMsg msg; +// +// @Test +// public void customerAttributeAddedInMetadata() { +// msg = new TbMsg(); +// node.onMsg(ctx, ); +// } + +} \ No newline at end of file From aec6b8c223c7a0878bd8bf01fc8f0a5f08df2651 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Mon, 19 Mar 2018 18:45:28 +0200 Subject: [PATCH 07/75] Rule node exception handling, add unit tests --- .../thingsboard/rule/engine/DonAsynchron.java | 7 +- .../engine/metadata/TbEntityGetAttrNode.java | 28 ++- .../engine/metadata/TbGetAttributesNode.java | 2 +- .../metadata/TbGetCustomerAttributeNode.java | 4 +- .../metadata/TbGetTenantAttributeNode.java | 4 +- .../TbGetCustomerAttributeNodeTest.java | 220 ++++++++++++++++-- 6 files changed, 231 insertions(+), 34 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java index 18ad3949cf..4fed574638 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java @@ -28,7 +28,12 @@ public class DonAsynchron { Futures.addCallback(future, new FutureCallback() { @Override public void onSuccess(@Nullable T result) { - onSuccess.accept(result); + try { + onSuccess.accept(result); + } catch (Throwable th) { + onFailure(th); + } + } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java index 834daa1041..7ba7dbccce 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -38,14 +38,18 @@ public abstract class TbEntityGetAttrNode implements TbNode @Override public void onMsg(TbContext ctx, TbMsg msg) { - withCallback( - findEntityAsync(ctx, msg.getOriginator()), - entityId -> withCallback( - ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()), - attributes -> putAttributesAndTell(ctx, msg, attributes), - t -> ctx.tellError(msg, t) - ), - t -> ctx.tellError(msg, t)); + try { + withCallback( + findEntityAsync(ctx, msg.getOriginator()), + entityId -> withCallback( + ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()), + attributes -> putAttributesAndTell(ctx, msg, attributes), + t -> ctx.tellError(msg, t) + ), + t -> ctx.tellError(msg, t)); + } catch (Throwable th) { + ctx.tellError(msg, th); + } } private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 34357ee3b2..4d41921740 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -44,7 +44,7 @@ public class TbGetAttributesNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException { - ListenableFuture> future = Futures.successfulAsList( + ListenableFuture> future = Futures.allAsList( putAttrAsync(ctx, msg, CLIENT_SCOPE, config.getClientAttributeNames(), "cs."), putAttrAsync(ctx, msg, SHARED_SCOPE, config.getSharedAttributeNames(), "shared."), putAttrAsync(ctx, msg, SERVER_SCOPE, config.getServerAttributeNames(), "ss.")); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index a138886f9a..57f9b79e7b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -43,7 +43,9 @@ public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode } private ListenableFuture getCustomerAsync(ListenableFuture future) { - return Futures.transform(future, (AsyncFunction) in -> Futures.immediateFuture(in.getCustomerId())); + return Futures.transform(future, (AsyncFunction) in -> { + return in != null ? Futures.immediateFuture(in.getCustomerId()) + : Futures.immediateFailedFuture(new IllegalStateException("Customer not found"));}); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index eaa61eac04..2cf9a97d20 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -56,7 +56,9 @@ public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { } private ListenableFuture getTenantAsync(ListenableFuture future) { - return Futures.transform(future, (AsyncFunction) in -> Futures.immediateFuture(in.getTenantId())); + return Futures.transform(future, (AsyncFunction) in -> { + return in != null ? Futures.immediateFuture(in.getTenantId()) + : Futures.immediateFailedFuture(new IllegalStateException("Tenant not found"));}); } } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index 5daf619bba..ae41c00b20 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,30 +15,214 @@ */ package org.thingsboard.rule.engine.metadata; +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.Futures; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; +import org.thingsboard.server.common.data.kv.StringDataEntry; import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.dao.asset.AssetService; +import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.user.UserService; -import static org.junit.Assert.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE; @RunWith(MockitoJUnitRunner.class) public class TbGetCustomerAttributeNodeTest { - //todo-vp: return to this after fixing compilation problem with protobuff -// private TbGetCustomerAttributeNode node; -// -// @Mock -// private TbContext ctx; -// -// private TbMsg msg; -// -// @Test -// public void customerAttributeAddedInMetadata() { -// msg = new TbMsg(); -// node.onMsg(ctx, ); -// } + private TbGetCustomerAttributeNode node; + + @Mock + private TbContext ctx; + + @Mock + private AttributesService attributesService; + @Mock + private UserService userService; + @Mock + private AssetService assetService; + @Mock + private DeviceService deviceService; + + private TbMsg msg; + + @Before + public void init() throws TbNodeException { + TbGetEntityAttrNodeConfiguration config = new TbGetEntityAttrNodeConfiguration(); + Map attrMapping = new HashMap<>(); + attrMapping.putIfAbsent("temperature", "tempo"); + config.setAttrMapping(attrMapping); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbGetCustomerAttributeNode(); + node.init(nodeConfiguration, null); + } + + @Test + public void errorThrownIfCannotLoadAttributes() { + UserId userId = new UserId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + User user = new User(); + user.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getUserService()).thenReturn(userService); + when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); + + when(ctx.getAttributesService()).thenReturn(attributesService); + when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature"))) + .thenThrow(new IllegalStateException("something wrong")); + + node.onMsg(ctx, msg); + final ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals("something wrong", value.getMessage()); + assertTrue(msg.getMetaData().getData().isEmpty()); + } + + @Test + public void errorThrownIfCannotLoadAttributesAsync() { + UserId userId = new UserId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + User user = new User(); + user.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getUserService()).thenReturn(userService); + when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); + + when(ctx.getAttributesService()).thenReturn(attributesService); + when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature"))) + .thenReturn(Futures.immediateFailedFuture(new IllegalStateException("something wrong"))); + + node.onMsg(ctx, msg); + final ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals("something wrong", value.getMessage()); + assertTrue(msg.getMetaData().getData().isEmpty()); + } + + @Test + public void errorThrownIfCustomerCannotBeFound() { + UserId userId = new UserId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + User user = new User(); + user.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getUserService()).thenReturn(userService); + when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(null)); + + node.onMsg(ctx, msg); + final ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals(IllegalStateException.class, value.getClass()); + assertEquals("Customer not found", value.getMessage()); + assertTrue(msg.getMetaData().getData().isEmpty()); + } + + @Test + public void customerAttributeAddedInMetadata() { + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + msg = new TbMsg(UUIDs.timeBased(), "CUSTOMER", customerId, new TbMsgMetaData(), new byte[4]); + entityAttributeFetched(customerId); + } + + @Test + public void usersCustomerAttributesFetched() { + UserId userId = new UserId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + User user = new User(); + user.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getUserService()).thenReturn(userService); + when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); + + entityAttributeFetched(customerId); + } + + @Test + public void assetsCustomerAttributesFetched() { + AssetId assetId = new AssetId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Asset asset = new Asset(); + asset.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", assetId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getAssetService()).thenReturn(assetService); + when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); + + entityAttributeFetched(customerId); + } + + @Test + public void deviceCustomerAttributesFetched() { + DeviceId deviceId = new DeviceId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Device device = new Device(); + device.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getDeviceService()).thenReturn(deviceService); + when(deviceService.findDeviceByIdAsync(deviceId)).thenReturn(Futures.immediateFuture(device)); + + entityAttributeFetched(customerId); + } + + private void entityAttributeFetched(CustomerId customerId) { + List attributes = Lists.newArrayList(new BaseAttributeKvEntry(new StringDataEntry("temperature", "high"), 1L)); + + when(ctx.getAttributesService()).thenReturn(attributesService); + when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature"))) + .thenReturn(Futures.immediateFuture(attributes)); + node.onMsg(ctx, msg); + verify(ctx).tellNext(msg); + assertEquals(msg.getMetaData().getValue("tempo"), "high"); + } } \ No newline at end of file From e68ee8b299b1f143cb8249ff12cdf06926947f26 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Mon, 19 Mar 2018 19:33:04 +0200 Subject: [PATCH 08/75] add Timeseries GetAttribute node --- .../rule/engine/api/TbContext.java | 3 ++ .../engine/metadata/TbEntityGetAttrNode.java | 22 +++++++++- .../TbGetEntityAttrNodeConfiguration.java | 1 + .../TbGetCustomerAttributeNodeTest.java | 44 +++++++++++++++++-- 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index e852500808..2908a4a39a 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -25,6 +25,7 @@ import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import java.util.UUID; @@ -68,4 +69,6 @@ public interface TbContext { RuleChainService getRuleChainService(); + TimeseriesService getTimeseriesService(); + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java index 7ba7dbccce..2d6641472c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -15,14 +15,19 @@ */ package org.thingsboard.rule.engine.metadata; +import com.google.common.base.Function; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; import java.util.List; +import java.util.stream.Collectors; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE; @@ -42,7 +47,7 @@ public abstract class TbEntityGetAttrNode implements TbNode withCallback( findEntityAsync(ctx, msg.getOriginator()), entityId -> withCallback( - ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()), + config.isTelemetry() ? getLatestTelemetry(ctx, entityId) : getAttributesAsync(ctx, entityId), attributes -> putAttributesAndTell(ctx, msg, attributes), t -> ctx.tellError(msg, t) ), @@ -52,7 +57,20 @@ public abstract class TbEntityGetAttrNode implements TbNode } } - private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { + private ListenableFuture> getAttributesAsync(TbContext ctx, EntityId entityId) { + ListenableFuture> latest = ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()); + return Futures.transform(latest, (Function, ? extends List>) l -> + l.stream().map(i -> (KvEntry) i).collect(Collectors.toList())); + } + + private ListenableFuture> getLatestTelemetry(TbContext ctx, EntityId entityId) { + ListenableFuture> latest = ctx.getTimeseriesService().findLatest(entityId, config.getAttrMapping().keySet()); + return Futures.transform(latest, (Function, ? extends List>) l -> + l.stream().map(i -> (KvEntry) i).collect(Collectors.toList())); + } + + + private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { attributes.forEach(r -> { String attrName = config.getAttrMapping().get(r.getKey()); msg.getMetaData().putValue(attrName, r.getValueAsString()); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java index bd53e83c07..a5e85c57d7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java @@ -24,4 +24,5 @@ import java.util.Optional; public class TbGetEntityAttrNodeConfiguration { private Map attrMapping; + private boolean isTelemetry = false; } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index ae41c00b20..23c5d4b4ba 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -35,14 +35,13 @@ import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.UserId; -import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; -import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import java.util.Collections; @@ -68,6 +67,8 @@ public class TbGetCustomerAttributeNodeTest { @Mock private AttributesService attributesService; @Mock + private TimeseriesService timeseriesService; + @Mock private UserService userService; @Mock private AssetService assetService; @@ -82,6 +83,7 @@ public class TbGetCustomerAttributeNodeTest { Map attrMapping = new HashMap<>(); attrMapping.putIfAbsent("temperature", "tempo"); config.setAttrMapping(attrMapping); + config.setTelemetry(false); ObjectMapper mapper = new ObjectMapper(); TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); nodeConfiguration.setData(mapper.valueToTree(config)); @@ -214,6 +216,42 @@ public class TbGetCustomerAttributeNodeTest { entityAttributeFetched(customerId); } + @Test + public void deviceCustomerTelemetryFetched() throws TbNodeException { + TbGetEntityAttrNodeConfiguration config = new TbGetEntityAttrNodeConfiguration(); + Map attrMapping = new HashMap<>(); + attrMapping.putIfAbsent("temperature", "tempo"); + config.setAttrMapping(attrMapping); + config.setTelemetry(true); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbGetCustomerAttributeNode(); + node.init(nodeConfiguration, null); + + + DeviceId deviceId = new DeviceId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Device device = new Device(); + device.setCustomerId(customerId); + + msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getDeviceService()).thenReturn(deviceService); + when(deviceService.findDeviceByIdAsync(deviceId)).thenReturn(Futures.immediateFuture(device)); + + List timeseries = Lists.newArrayList(new BasicTsKvEntry(1L, new StringDataEntry("temperature", "highest"))); + + when(ctx.getTimeseriesService()).thenReturn(timeseriesService); + when(timeseriesService.findLatest(customerId, Collections.singleton("temperature"))) + .thenReturn(Futures.immediateFuture(timeseries)); + + node.onMsg(ctx, msg); + verify(ctx).tellNext(msg); + assertEquals(msg.getMetaData().getValue("tempo"), "highest"); + } + private void entityAttributeFetched(CustomerId customerId) { List attributes = Lists.newArrayList(new BaseAttributeKvEntry(new StringDataEntry("temperature", "high"), 1L)); From 46e79bf66cef2eb42f476e26e6198eb5039f454e Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Mon, 19 Mar 2018 19:51:26 +0200 Subject: [PATCH 09/75] add Related GetAttribute node --- .../rule/engine/api/TbContext.java | 3 ++ .../TbGetRelatedAttrNodeConfiguration.java | 11 +++++ .../metadata/TbGetRelatedAttributeNode.java | 47 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 2908a4a39a..541d35b899 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -23,6 +23,7 @@ import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.plugin.PluginService; +import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.timeseries.TimeseriesService; @@ -71,4 +72,6 @@ public interface TbContext { TimeseriesService getTimeseriesService(); + RelationService getRelationService(); + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java new file mode 100644 index 0000000000..40987daeaa --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java @@ -0,0 +1,11 @@ +package org.thingsboard.rule.engine.metadata; + +import lombok.Data; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; + +@Data +public class TbGetRelatedAttrNodeConfiguration { + + private String relationType; + private EntitySearchDirection direction; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java new file mode 100644 index 0000000000..596b1dfee5 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -0,0 +1,47 @@ +package org.thingsboard.rule.engine.metadata; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.apache.commons.collections.CollectionUtils; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.dao.relation.RelationService; + +import java.util.List; + +import static org.thingsboard.server.common.data.relation.RelationTypeGroup.COMMON; + +public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { + + private TbGetRelatedAttrNodeConfiguration config; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbGetRelatedAttrNodeConfiguration.class); + } + + @Override + protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { + RelationService relationService = ctx.getRelationService(); + if (config.getDirection() == EntitySearchDirection.FROM) { + ListenableFuture> asyncRelation = relationService.findByFromAndTypeAsync(originator, config.getRelationType(), COMMON); + return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) + r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getTo()) + : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); + } else if (config.getDirection() == EntitySearchDirection.TO) { + ListenableFuture> asyncRelation = relationService.findByToAndTypeAsync(originator, config.getRelationType(), COMMON); + return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) + r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getFrom()) + : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); + } + + return Futures.immediateFailedFuture(new IllegalStateException("Unknown direction")); + } +} From f8929de57861fedd199d0538af5ef823b385dbbc Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 20 Mar 2018 08:51:31 +0200 Subject: [PATCH 10/75] Adding RuleChain and RuleNode actors --- application/pom.xml | 4 + .../server/actors/ActorSystemContext.java | 6 + .../server/actors/app/AppActor.java | 57 ++++--- .../plugin/PluginActorMessageProcessor.java | 8 +- .../rule/RuleActorMessageProcessor.java | 4 +- .../actors/ruleChain/DefaultTbContext.java | 61 ++++++++ .../actors/ruleChain/RuleChainActor.java | 19 ++- .../RuleChainActorMessageProcessor.java | 140 ++++++++++++------ .../ruleChain/RuleChainManagerActor.java | 3 + .../ruleChain/RuleChainToRuleNodeMsg.java | 23 +++ .../actors/ruleChain/RuleNodeActor.java | 72 +++++++++ .../RuleNodeActorMessageProcessor.java | 78 ++++++++++ .../server/actors/ruleChain/RuleNodeCtx.java | 15 ++ .../actors/ruleChain/RuleNodeRelation.java | 17 +++ .../RuleNodeToRuleChainTellNextMsg.java | 24 +++ .../server/actors/service/ActorService.java | 4 + .../server/actors/service/ComponentActor.java | 4 +- .../actors/service/ContextAwareActor.java | 19 +++ .../actors/service/DefaultActorService.java | 6 + .../AbstractContextAwareMsgProcessor.java | 3 - .../actors/shared/ComponentMsgProcessor.java | 31 +++- .../actors/shared/EntityActorsManager.java | 9 +- .../shared/rulechain/RuleChainManager.java | 14 ++ .../server/actors/tenant/TenantActor.java | 57 ++++--- .../src/main/resources/thingsboard.yml | 6 + .../server/common/data/DataConstants.java | 2 + .../common/data/plugin/ComponentType.java | 2 +- .../server/common/msg/MsgType.java | 30 ++++ .../thingsboard/server/common/msg/TbMsg.java | 28 ++-- .../server/common/msg/TbMsgDataType.java | 11 ++ .../msg/plugin/ComponentLifecycleMsg.java | 8 +- .../msg/system/ServiceToRuleEngineMsg.java | 22 +++ common/message/src/main/proto/tbmsg.proto | 12 +- .../server/dao/rule/BaseRuleService.java | 63 +------- .../rule/engine/api/TbContext.java | 2 +- .../engine/transform/TbTransformNode.java | 1 + 36 files changed, 670 insertions(+), 195 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainToRuleNodeMsg.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java create mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java create mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java diff --git a/application/pom.xml b/application/pom.xml index 8449246059..95322fa3a2 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -53,6 +53,10 @@ org.thingsboard extensions-api + + org.thingsboard.rule-engine + rule-engine-api + org.thingsboard extensions-core diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index f59ec63ed7..68d55475af 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -136,6 +136,12 @@ public class ActorSystemContext { @Value("${actors.plugin.error_persist_frequency}") @Getter private long pluginErrorPersistFrequency; + @Value("${actors.rule.chain.error_persist_frequency}") + @Getter private long ruleChainErrorPersistFrequency; + + @Value("${actors.rule.node.error_persist_frequency}") + @Getter private long ruleNodeErrorPersistFrequency; + @Value("${actors.rule.termination.delay}") @Getter private long ruleActorTerminationDelay; diff --git a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java index 549d71d984..5e05a60a14 100644 --- a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java @@ -33,9 +33,11 @@ import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageDataIterable; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; @@ -86,27 +88,48 @@ public class AppActor extends RuleChainManagerActor { } @Override - public void onReceive(Object msg) throws Exception { - logger.debug("Received message: {}", msg); - if (msg instanceof ToDeviceActorMsg) { - processDeviceMsg((ToDeviceActorMsg) msg); - } else if (msg instanceof ToPluginActorMsg) { - onToPluginMsg((ToPluginActorMsg) msg); - } else if (msg instanceof ToDeviceActorNotificationMsg) { - onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); - } else if (msg instanceof Terminated) { - processTermination((Terminated) msg); - } else if (msg instanceof ClusterEventMsg) { - broadcast(msg); - } else if (msg instanceof ComponentLifecycleMsg) { - onComponentLifecycleMsg((ComponentLifecycleMsg) msg); - } else if (msg instanceof PluginTerminationMsg) { - onPluginTerminated((PluginTerminationMsg) msg); + protected void process(TbActorMsg msg) { + switch (msg.getMsgType()) { + case COMPONENT_LIFE_CYCLE_MSG: + onComponentLifecycleMsg((ComponentLifecycleMsg) msg); + break; + case SERVICE_TO_RULE_ENGINE_MSG: + onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); + break; + } + } + + private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { + if (SYSTEM_TENANT.equals(msg.getTenantId())) { + //TODO: ashvayka handle this. } else { - logger.warning("Unknown message: {}!", msg); + getOrCreateTenantActor(msg.getTenantId()).tell(msg, self()); } } + +// @Override +// public void onReceive(Object msg) throws Exception { +// logger.debug("Received message: {}", msg); +// if (msg instanceof ToDeviceActorMsg) { +// processDeviceMsg((ToDeviceActorMsg) msg); +// } else if (msg instanceof ToPluginActorMsg) { +// onToPluginMsg((ToPluginActorMsg) msg); +// } else if (msg instanceof ToDeviceActorNotificationMsg) { +// onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); +// } else if (msg instanceof Terminated) { +// processTermination((Terminated) msg); +// } else if (msg instanceof ClusterEventMsg) { +// broadcast(msg); +// } else if (msg instanceof ComponentLifecycleMsg) { +// onComponentLifecycleMsg((ComponentLifecycleMsg) msg); +// } else if (msg instanceof PluginTerminationMsg) { +// onPluginTerminated((PluginTerminationMsg) msg); +// } else { +// logger.warning("Unknown message: {}!", msg); +// } +// } + private void onPluginTerminated(PluginTerminationMsg msg) { pluginManager.remove(msg.getId()); } diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java index 6e78e20521..09aaf80dee 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java @@ -57,7 +57,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor } @Override - public void start() throws Exception { + public void start(ActorContext context) throws Exception { logger.info("[{}] Going to start plugin actor.", entityId); pluginMd = systemContext.getPluginService().findPluginById(entityId); if (pluginMd == null) { @@ -76,7 +76,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor } @Override - public void stop() throws Exception { + public void stop(ActorContext context) throws Exception { onStop(); } @@ -191,7 +191,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor if (pluginImpl != null) { pluginImpl.stop(trustedCtx); } - start(); + start(context); } } @@ -217,7 +217,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor pluginImpl.resume(trustedCtx); logger.info("[{}] Plugin resumed.", entityId); } else { - start(); + start(context); } } diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java index 2ebebfca33..236fca7e0f 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java @@ -68,7 +68,7 @@ class RuleActorMessageProcessor extends ComponentMsgProcessor { } @Override - public void start() throws Exception { + public void start(ActorContext context) throws Exception { logger.info("[{}][{}] Starting rule actor.", entityId, tenantId); ruleMd = systemContext.getRuleService().findRuleById(entityId); if (ruleMd == null) { @@ -86,7 +86,7 @@ class RuleActorMessageProcessor extends ComponentMsgProcessor { } @Override - public void stop() throws Exception { + public void stop(ActorContext context) throws Exception { onStop(); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java new file mode 100644 index 0000000000..0cd7601653 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -0,0 +1,61 @@ +package org.thingsboard.server.actors.ruleChain; + +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.dao.attributes.AttributesService; + +/** + * Created by ashvayka on 19.03.18. + */ +class DefaultTbContext implements TbContext { + + private final ActorSystemContext mainCtx; + private final RuleNodeCtx nodeCtx; + + public DefaultTbContext(ActorSystemContext mainCtx, RuleNodeCtx nodeCtx) { + this.mainCtx = mainCtx; + this.nodeCtx = nodeCtx; + } + + @Override + public void tellNext(TbMsg msg) { + tellNext(msg, null); + } + + @Override + public void tellNext(TbMsg msg, String relationType) { + nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelfId(), relationType, msg), nodeCtx.getSelf()); + } + + @Override + public void tellSelf(TbMsg msg, long delayMs) { + + } + + @Override + public void tellOthers(TbMsg msg) { + + } + + @Override + public void tellSibling(TbMsg msg, ServerAddress address) { + + } + + @Override + public void spawn(TbMsg msg) { + + } + + @Override + public void ack(TbMsg msg) { + + } + + @Override + public AttributesService getAttributesService() { + return mainCtx.getAttributesService(); + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java index 83536f83da..20ea05deb4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -20,6 +20,9 @@ import org.thingsboard.server.actors.service.ComponentActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; public class RuleChainActor extends ComponentActor { @@ -30,8 +33,18 @@ public class RuleChainActor extends ComponentActor { @@ -54,6 +67,6 @@ public class RuleChainActor extends ComponentActor * 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 - * + *

+ * 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. @@ -17,77 +17,127 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.ActorContext; import akka.actor.ActorRef; +import akka.actor.Props; import akka.event.LoggingAdapter; -import com.fasterxml.jackson.core.JsonProcessingException; import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.plugin.*; +import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.actors.shared.ComponentMsgProcessor; -import org.thingsboard.server.common.data.id.PluginId; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; -import org.thingsboard.server.common.data.plugin.ComponentType; -import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.cluster.ServerAddress; -import org.thingsboard.server.extensions.api.plugins.Plugin; -import org.thingsboard.server.extensions.api.plugins.PluginInitializationException; -import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; -import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; -import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; -import org.thingsboard.server.extensions.api.rules.RuleException; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; +import org.thingsboard.server.dao.rule.RuleChainService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author Andrew Shvayka */ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor { - private ComponentLifecycleState state; + private final ActorRef parent; + private final ActorRef self; + private final Map nodeActors; + private final Map> nodeRoutes; + private final RuleChainService service; + + private RuleNodeId firstId; + private RuleNodeCtx firstNode; - protected RuleChainActorMessageProcessor(TenantId tenantId, RuleChainId pluginId, ActorSystemContext systemContext + RuleChainActorMessageProcessor(TenantId tenantId, RuleChainId ruleChainId, ActorSystemContext systemContext , LoggingAdapter logger, ActorRef parent, ActorRef self) { - super(systemContext, logger, tenantId, pluginId); + super(systemContext, logger, tenantId, ruleChainId); + this.parent = parent; + this.self = self; + this.nodeActors = new HashMap<>(); + this.nodeRoutes = new HashMap<>(); + this.service = systemContext.getRuleChainService(); } @Override - public void start() throws Exception { - + public void start(ActorContext context) throws Exception { + RuleChain ruleChain = service.findRuleChainById(entityId); + List ruleNodeList = service.getRuleChainNodes(entityId); + // Creating and starting the actors; + for (RuleNode ruleNode : ruleNodeList) { + String dispatcherName = tenantId.getId().equals(EntityId.NULL_UUID) ? + DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME : DefaultActorService.TENANT_RULE_DISPATCHER_NAME; + ActorRef ruleNodeActor = context.actorOf( + Props.create(new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getId())) + .withDispatcher(dispatcherName), ruleNode.toString()); + nodeActors.put(ruleNode.getId(), new RuleNodeCtx(self, ruleNodeActor, ruleNode.getId())); + } + // Populating the routes map; + for (RuleNode ruleNode : ruleNodeList) { + List relations = service.getRuleNodeRelations(ruleNode.getId()); + for (EntityRelation relation : relations) { + if (relation.getTo().getEntityType() == EntityType.RULE_NODE) { + RuleNodeCtx ruleNodeCtx = nodeActors.get(new RuleNodeId(relation.getTo().getId())); + if (ruleNodeCtx == null) { + throw new IllegalArgumentException("Rule Node [" + relation.getFrom() + "] has invalid relation to Rule node [" + relation.getTo() + "]"); + } + } + nodeRoutes.computeIfAbsent(ruleNode.getId(), k -> new ArrayList<>()) + .add(new RuleNodeRelation(ruleNode.getId(), relation.getTo(), relation.getType())); + } + } + + firstId = ruleChain.getFirstRuleNodeId(); + firstNode = nodeActors.get(ruleChain.getFirstRuleNodeId()); } @Override - public void stop() throws Exception { - + public void stop(ActorContext context) throws Exception { + nodeActors.values().stream().map(RuleNodeCtx::getSelf).forEach(context::stop); + nodeActors.clear(); + nodeRoutes.clear(); } @Override - public void onCreated(ActorContext context) throws Exception { + public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { } - @Override - public void onUpdate(ActorContext context) throws Exception { - + void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg envelope) { + TbMsg tbMsg = envelope.getTbMsg(); + //TODO: push to queue and act on ack in async way + pushMstToNode(firstNode, tbMsg); } - @Override - public void onActivate(ActorContext context) throws Exception { - + void onTellNext(RuleNodeToRuleChainTellNextMsg envelope) { + RuleNodeId originator = envelope.getOriginator(); + String targetRelationType = envelope.getRelationType(); + //TODO: log debug output + List relations = nodeRoutes.get(originator); + for (RuleNodeRelation relation : relations) { + if (targetRelationType == null || targetRelationType.equalsIgnoreCase(relation.getType())) { + switch (relation.getOut().getEntityType()) { + case RULE_NODE: + RuleNodeId targetRuleNodeId = new RuleNodeId(relation.getOut().getId()); + RuleNodeCtx targetRuleNode = nodeActors.get(targetRuleNodeId); + pushMstToNode(targetRuleNode, envelope.getMsg()); + break; + case RULE_CHAIN: +// TODO: implement + break; + } + } + } } - @Override - public void onSuspend(ActorContext context) throws Exception { - - } - - @Override - public void onStop(ActorContext context) throws Exception { - + private void pushMstToNode(RuleNodeCtx nodeCtx, TbMsg msg) { + //TODO: log debug input + firstNode.getSelf().tell(new RuleChainToRuleNodeMsg(new DefaultTbContext(systemContext, nodeCtx), msg), self); } - @Override - public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { - - } } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java index 2dca8ddb0d..cb76f04306 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java @@ -8,6 +8,7 @@ import org.thingsboard.server.actors.shared.rulechain.RuleChainManager; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.dao.rule.RuleChainService; /** * Created by ashvayka on 15.03.18. @@ -16,11 +17,13 @@ public abstract class RuleChainManagerActor extends ContextAwareActor { protected final RuleChainManager ruleChainManager; protected final PluginManager pluginManager; + protected final RuleChainService ruleChainService; public RuleChainManagerActor(ActorSystemContext systemContext, RuleChainManager ruleChainManager, PluginManager pluginManager) { super(systemContext); this.ruleChainManager = ruleChainManager; this.pluginManager = pluginManager; + this.ruleChainService = systemContext.getRuleChainService(); } protected void initRuleChains() { diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainToRuleNodeMsg.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainToRuleNodeMsg.java new file mode 100644 index 0000000000..d6e82621ae --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainToRuleNodeMsg.java @@ -0,0 +1,23 @@ +package org.thingsboard.server.actors.ruleChain; + +import lombok.Data; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; + +/** + * Created by ashvayka on 19.03.18. + */ +@Data +final class RuleChainToRuleNodeMsg implements TbActorMsg { + + private final TbContext ctx; + private final TbMsg msg; + + @Override + public MsgType getMsgType() { + return MsgType.RULE_CHAIN_TO_RULE_MSG; + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java new file mode 100644 index 0000000000..cba19d17bc --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java @@ -0,0 +1,72 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; + +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.ComponentActor; +import org.thingsboard.server.actors.service.ContextBasedCreator; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.TbActorMsg; + +public class RuleNodeActor extends ComponentActor { + + private final RuleChainId ruleChainId; + + private RuleNodeActor(ActorSystemContext systemContext, TenantId tenantId, RuleChainId ruleChainId, RuleNodeId ruleNodeId) { + super(systemContext, tenantId, ruleNodeId); + this.ruleChainId = ruleChainId; + setProcessor(new RuleNodeActorMessageProcessor(tenantId, ruleChainId, ruleNodeId, systemContext, + logger, context().parent(), context().self())); + } + + @Override + protected void process(TbActorMsg msg) { + switch (msg.getMsgType()) { + case RULE_CHAIN_TO_RULE_MSG: + processor.onRuleChainToRuleNodeMsg((RuleChainToRuleNodeMsg) msg); + break; + } + } + + public static class ActorCreator extends ContextBasedCreator { + private static final long serialVersionUID = 1L; + + private final TenantId tenantId; + private final RuleChainId ruleChainId; + private final RuleNodeId ruleNodeId; + + public ActorCreator(ActorSystemContext context, TenantId tenantId, RuleChainId ruleChainId, RuleNodeId ruleNodeId) { + super(context); + this.tenantId = tenantId; + this.ruleChainId = ruleChainId; + this.ruleNodeId = ruleNodeId; + + } + + @Override + public RuleNodeActor create() throws Exception { + return new RuleNodeActor(context, tenantId, ruleChainId, ruleNodeId); + } + } + + @Override + protected long getErrorPersistFrequency() { + return systemContext.getRuleNodeErrorPersistFrequency(); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java new file mode 100644 index 0000000000..99e48d858d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java @@ -0,0 +1,78 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; + +import akka.actor.ActorContext; +import akka.actor.ActorRef; +import akka.actor.Props; +import akka.event.LoggingAdapter; +import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.service.DefaultActorService; +import org.thingsboard.server.actors.shared.ComponentMsgProcessor; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; +import org.thingsboard.server.dao.rule.RuleChainService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Andrew Shvayka + */ +public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor { + + private final ActorRef parent; + private final ActorRef self; + private final RuleChainService service; + + RuleNodeActorMessageProcessor(TenantId tenantId, RuleChainId ruleChainId, RuleNodeId ruleNodeId, ActorSystemContext systemContext + , LoggingAdapter logger, ActorRef parent, ActorRef self) { + super(systemContext, logger, tenantId, ruleNodeId); + this.parent = parent; + this.self = self; + this.service = systemContext.getRuleChainService(); + } + + @Override + public void start(ActorContext context) throws Exception { + + } + + @Override + public void stop(ActorContext context) throws Exception { + } + + @Override + public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { + + } + + void onRuleChainToRuleNodeMsg(RuleChainToRuleNodeMsg msg) { + + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java new file mode 100644 index 0000000000..dd25f8bc85 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java @@ -0,0 +1,15 @@ +package org.thingsboard.server.actors.ruleChain; + +import akka.actor.ActorRef; +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleNodeId; + +/** + * Created by ashvayka on 19.03.18. + */ +@Data +final class RuleNodeCtx { + private final ActorRef chainActor; + private final ActorRef self; + private final RuleNodeId selfId; +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java new file mode 100644 index 0000000000..bd2d544eb3 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java @@ -0,0 +1,17 @@ +package org.thingsboard.server.actors.ruleChain; + +import lombok.Data; +import org.thingsboard.server.common.data.id.EntityId; + +/** + * Created by ashvayka on 19.03.18. + */ + +@Data +final class RuleNodeRelation { + + private final EntityId in; + private final EntityId out; + private final String type; + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java new file mode 100644 index 0000000000..95b362591d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java @@ -0,0 +1,24 @@ +package org.thingsboard.server.actors.ruleChain; + +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; + +/** + * Created by ashvayka on 19.03.18. + */ +@Data +final class RuleNodeToRuleChainTellNextMsg implements TbActorMsg { + + private final RuleNodeId originator; + private final String relationType; + private final TbMsg msg; + + @Override + public MsgType getMsgType() { + return MsgType.RULE_TO_RULE_CHAIN_TELL_NEXT_MSG; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java index 0f66d256ed..0be0385365 100644 --- a/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java +++ b/application/src/main/java/org/thingsboard/server/actors/service/ActorService.java @@ -17,6 +17,8 @@ package org.thingsboard.server.actors.service; import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.common.transport.SessionMsgProcessor; import org.thingsboard.server.service.cluster.discovery.DiscoveryServiceListener; import org.thingsboard.server.service.cluster.rpc.RpcMsgListener; @@ -25,6 +27,8 @@ public interface ActorService extends SessionMsgProcessor, WebSocketMsgProcessor void onEntityStateChange(TenantId tenantId, EntityId entityId, ComponentLifecycleEvent state); + void onMsg(ServiceToRuleEngineMsg msg); + void onCredentialsUpdate(TenantId tenantId, DeviceId deviceId); void onDeviceNameOrTypeUpdate(TenantId tenantId, DeviceId deviceId, String deviceName, String deviceType); diff --git a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java b/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java index 76b9be96b3..d0260dd974 100644 --- a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java @@ -54,7 +54,7 @@ public abstract class ComponentActor extends AbstractContextAwareMsgPr this.entityId = id; } - public abstract void start() throws Exception; + public abstract void start(ActorContext context) throws Exception; - public abstract void stop() throws Exception; + public abstract void stop(ActorContext context) throws Exception; - public abstract void onCreated(ActorContext context) throws Exception; + public abstract void onClusterEventMsg(ClusterEventMsg msg) throws Exception; - public abstract void onUpdate(ActorContext context) throws Exception; + public void onCreated(ActorContext context) throws Exception { + start(context); + } - public abstract void onActivate(ActorContext context) throws Exception; + public void onUpdate(ActorContext context) throws Exception { + restart(context); + } - public abstract void onSuspend(ActorContext context) throws Exception; + public void onActivate(ActorContext context) throws Exception { + restart(context); + } - public abstract void onStop(ActorContext context) throws Exception; + public void onSuspend(ActorContext context) throws Exception { + stop(context); + } - public abstract void onClusterEventMsg(ClusterEventMsg msg) throws Exception; + public void onStop(ActorContext context) throws Exception { + stop(context); + } + + private void restart(ActorContext context) throws Exception { + stop(context); + start(context); + } public void scheduleStatsPersistTick(ActorContext context, long statsPersistFrequency) { schedulePeriodicMsgWithDelay(context, new StatsPersistTick(), statsPersistFrequency, statsPersistFrequency); diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java index a98609ceee..917a6452c4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java @@ -43,13 +43,16 @@ public abstract class EntityActorsManager(getFetchEntitiesFunction(), ContextAwareActor.ENTITY_PACK_LIMIT)) { - log.debug("[{}] Creating plugin actor", entity.getId()); + T entityId = (T) entity.getId(); + log.debug("[{}|{}] Creating entity actor", entityId.getEntityType(), entityId.getId()); //TODO: remove this cast making UUIDBased subclass of EntityId an interface and vice versa. - getOrCreateActor(context, (T) entity.getId()); - log.debug("[{}] Plugin actor created.", entity.getId()); + ActorRef actorRef = getOrCreateActor(context, entityId); + visit(entity, actorRef); + log.debug("[{}|{}] Entity actor created.", entityId.getEntityType(), entityId.getId()); } } + protected void visit(M entity, ActorRef actorRef) {} public ActorRef getOrCreateActor(ActorContext context, T entityId) { return actors.computeIfAbsent(entityId, eId -> diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java index 09396110b4..97acb6cbfb 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java @@ -1,6 +1,8 @@ package org.thingsboard.server.actors.shared.rulechain; +import akka.actor.ActorRef; import akka.japi.Creator; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.ruleChain.RuleChainActor; @@ -16,6 +18,10 @@ import org.thingsboard.server.dao.rule.RuleChainService; public abstract class RuleChainManager extends EntityActorsManager { protected final RuleChainService service; + @Getter + protected RuleChain rootChain; + @Getter + protected ActorRef rootChainActor; public RuleChainManager(ActorSystemContext systemContext) { super(systemContext); @@ -27,4 +33,12 @@ public abstract class RuleChainManager extends EntityActorsManager deviceActors; @@ -62,25 +62,42 @@ public class TenantActor extends RuleChainManagerActor { } @Override - public void onReceive(Object msg) throws Exception { - logger.debug("[{}] Received message: {}", tenantId, msg); - if (msg instanceof ToDeviceActorMsg) { - onToDeviceActorMsg((ToDeviceActorMsg) msg); - } else if (msg instanceof ToPluginActorMsg) { - onToPluginMsg((ToPluginActorMsg) msg); - } else if (msg instanceof ToDeviceActorNotificationMsg) { - onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); - } else if (msg instanceof ClusterEventMsg) { - broadcast(msg); - } else if (msg instanceof ComponentLifecycleMsg) { - onComponentLifecycleMsg((ComponentLifecycleMsg) msg); - } else if (msg instanceof PluginTerminationMsg) { - onPluginTerminated((PluginTerminationMsg) msg); - } else { - logger.warning("[{}] Unknown message: {}!", tenantId, msg); + protected void process(TbActorMsg msg) { + switch (msg.getMsgType()) { + case COMPONENT_LIFE_CYCLE_MSG: + onComponentLifecycleMsg((ComponentLifecycleMsg) msg); + break; + case SERVICE_TO_RULE_ENGINE_MSG: + onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); + break; } } + private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { + ruleChainManager.getRootChainActor().tell(msg, self()); + } + + +// @Override +// public void onReceive(Object msg) throws Exception { +// logger.debug("[{}] Received message: {}", tenantId, msg); +// if (msg instanceof ToDeviceActorMsg) { +// onToDeviceActorMsg((ToDeviceActorMsg) msg); +// } else if (msg instanceof ToPluginActorMsg) { +// onToPluginMsg((ToPluginActorMsg) msg); +// } else if (msg instanceof ToDeviceActorNotificationMsg) { +// onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); +// } else if (msg instanceof ClusterEventMsg) { +// broadcast(msg); +// } else if (msg instanceof ComponentLifecycleMsg) { +// onComponentLifecycleMsg((ComponentLifecycleMsg) msg); +// } else if (msg instanceof PluginTerminationMsg) { +// onPluginTerminated((PluginTerminationMsg) msg); +// } else { +// logger.warning("[{}] Unknown message: {}!", tenantId, msg); +// } +// } + private void broadcast(Object msg) { pluginManager.broadcast(msg); deviceActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 1c842c8a1b..778c2a3ffb 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -215,6 +215,12 @@ actors: termination.delay: "${ACTORS_RULE_TERMINATION_DELAY:30000}" # Errors for particular actor are persisted once per specified amount of milliseconds error_persist_frequency: "${ACTORS_RULE_ERROR_FREQUENCY:3000}" + chain: + # Errors for particular actor are persisted once per specified amount of milliseconds + error_persist_frequency: "${ACTORS_RULE_CHAIN_ERROR_FREQUENCY:3000}" + node: + # Errors for particular actor are persisted once per specified amount of milliseconds + error_persist_frequency: "${ACTORS_RULE_NODE_ERROR_FREQUENCY:3000}" statistics: # Enable/disable actor statistics enabled: "${ACTORS_STATISTICS_ENABLED:true}" diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java index a776d7b6ce..5624ed801f 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java @@ -37,6 +37,8 @@ public class DataConstants { public static final String ERROR = "ERROR"; public static final String LC_EVENT = "LC_EVENT"; public static final String STATS = "STATS"; + public static final String RULE_CHAIN_DEBUG = "DEBUG_RULE_CHAIN"; + public static final String RULE_NODE_DEBUG = "DEBUG_RULE_NODE"; public static final String ONEWAY = "ONEWAY"; public static final String TWOWAY = "TWOWAY"; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java index 45fb590ed6..ab6accaf11 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java @@ -20,6 +20,6 @@ package org.thingsboard.server.common.data.plugin; */ public enum ComponentType { - FILTER, PROCESSOR, ACTION, PLUGIN + ENRICHMENT, FILTER, PROCESSOR, TRANSFORMATION, ACTION, PLUGIN } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java index 55c131d12d..22fc4285a9 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java @@ -4,4 +4,34 @@ package org.thingsboard.server.common.msg; * Created by ashvayka on 15.03.18. */ public enum MsgType { + + /** + * ADDED/UPDATED/DELETED events for main entities. + * + * @See {@link org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg} + */ + COMPONENT_LIFE_CYCLE_MSG, + + /** + * Misc messages from the REST API/SERVICE layer to the new rule engine. + * + * @See {@link org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg} + */ + SERVICE_TO_RULE_ENGINE_MSG, + + + SESSION_TO_DEVICE_ACTOR_MSG, + DEVICE_ACTOR_TO_SESSION_MSG, + + + /** + * Message that is sent by RuleChainActor to RuleActor with command to process TbMsg. + */ + RULE_CHAIN_TO_RULE_MSG, + + /** + * Message that is sent by RuleActor to RuleChainActor with command to process TbMsg by next nodes in chain. + */ + RULE_TO_RULE_CHAIN_TELL_NEXT_MSG, + } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java index 5163b6c39d..c689b24fe8 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -36,7 +36,7 @@ public final class TbMsg implements Serializable { private final String type; private final EntityId originator; private final TbMsgMetaData metaData; - + private final TbMsgDataType dataType; private final byte[] data; public static ByteBuffer toBytes(TbMsg msg) { @@ -49,11 +49,10 @@ public final class TbMsg implements Serializable { } if (msg.getMetaData() != null) { - MsgProtos.TbMsgProto.TbMsgMetaDataProto.Builder metadataBuilder = MsgProtos.TbMsgProto.TbMsgMetaDataProto.newBuilder(); - metadataBuilder.putAllData(msg.getMetaData().getData()); - builder.addMetaData(metadataBuilder.build()); + builder.setMetaData(MsgProtos.TbMsgMetaDataProto.newBuilder().putAllData(msg.getMetaData().getData()).build()); } + builder.setDataType(msg.getDataType().ordinal()); builder.setData(ByteString.copyFrom(msg.getData())); byte[] bytes = builder.build().toByteArray(); return ByteBuffer.wrap(bytes); @@ -63,16 +62,11 @@ public final class TbMsg implements Serializable { try { MsgProtos.TbMsgProto proto = MsgProtos.TbMsgProto.parseFrom(buffer.array()); TbMsgMetaData metaData = new TbMsgMetaData(); - if (proto.getMetaDataCount() > 0) { - metaData.setData(proto.getMetaData(0).getDataMap()); - } - - EntityId entityId = null; - if (proto.getEntityId() != null) { - entityId = EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()); - } + metaData.setData(proto.getMetaData().getDataMap()); - return new TbMsg(UUID.fromString(proto.getId()), proto.getType(), entityId, metaData, proto.getData().toByteArray()); + EntityId entityId = EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()); + TbMsgDataType dataType = TbMsgDataType.values()[proto.getDataType()]; + return new TbMsg(UUID.fromString(proto.getId()), proto.getType(), entityId, metaData, dataType, proto.getData().toByteArray()); } catch (InvalidProtocolBufferException e) { throw new IllegalStateException("Could not parse protobuf for TbMsg", e); } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java new file mode 100644 index 0000000000..b6e2d5a5c5 --- /dev/null +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java @@ -0,0 +1,11 @@ +package org.thingsboard.server.common.msg; + +/** + * Created by ashvayka on 15.03.18. + */ +public enum TbMsgDataType { + + // Do not change ordering. We use ordinal to save some bytes on serialization + JSON, TEXT, BINARY; + +} diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java index b77722e826..315eb86f6c 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java @@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.aware.TenantAwareMsg; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; @@ -30,7 +32,7 @@ import java.util.Optional; * @author Andrew Shvayka */ @ToString -public class ComponentLifecycleMsg implements TenantAwareMsg, ToAllNodesMsg { +public class ComponentLifecycleMsg implements TbActorMsg, TenantAwareMsg, ToAllNodesMsg { @Getter private final TenantId tenantId; @Getter @@ -56,4 +58,8 @@ public class ComponentLifecycleMsg implements TenantAwareMsg, ToAllNodesMsg { return entityId.getEntityType() == EntityType.RULE_CHAIN ? Optional.of((RuleChainId) entityId) : Optional.empty(); } + @Override + public MsgType getMsgType() { + return MsgType.COMPONENT_LIFE_CYCLE_MSG; + } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java new file mode 100644 index 0000000000..3d82033b31 --- /dev/null +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java @@ -0,0 +1,22 @@ +package org.thingsboard.server.common.msg.system; + +import lombok.Data; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; + +/** + * Created by ashvayka on 15.03.18. + */ +@Data +public final class ServiceToRuleEngineMsg implements TbActorMsg { + + private final TenantId tenantId; + private final TbMsg tbMsg; + + @Override + public MsgType getMsgType() { + return MsgType.SERVICE_TO_RULE_ENGINE_MSG; + } +} diff --git a/common/message/src/main/proto/tbmsg.proto b/common/message/src/main/proto/tbmsg.proto index 90fa2bdbae..62acff20ce 100644 --- a/common/message/src/main/proto/tbmsg.proto +++ b/common/message/src/main/proto/tbmsg.proto @@ -19,6 +19,9 @@ package msgqueue; option java_package = "org.thingsboard.server.common.msg.gen"; option java_outer_classname = "MsgProtos"; +message TbMsgMetaDataProto { + map data = 1; +} message TbMsgProto { string id = 1; @@ -26,11 +29,8 @@ message TbMsgProto { string entityType = 3; string entityId = 4; - message TbMsgMetaDataProto { - map data = 1; - } + TbMsgMetaDataProto metaData = 5; - repeated TbMsgMetaDataProto metaData = 5; - - bytes data = 6; + int32 dataType = 6; + bytes data = 7; } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java index f1df09edb9..fff3f6d907 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java @@ -16,7 +16,6 @@ package org.thingsboard.server.dao.rule; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -67,67 +66,7 @@ public class BaseRuleService extends AbstractEntityService implements RuleServic @Override public RuleMetaData saveRule(RuleMetaData rule) { - ruleValidator.validate(rule); - if (rule.getTenantId() == null) { - log.trace("Save system rule metadata with predefined id {}", systemTenantId); - rule.setTenantId(systemTenantId); - } - if (rule.getId() != null) { - RuleMetaData oldVersion = ruleDao.findById(rule.getId()); - if (rule.getState() == null) { - rule.setState(oldVersion.getState()); - } else if (rule.getState() != oldVersion.getState()) { - throw new IncorrectParameterException("Use Activate/Suspend method to control state of the rule!"); - } - } else { - if (rule.getState() == null) { - rule.setState(ComponentLifecycleState.SUSPENDED); - } else if (rule.getState() != ComponentLifecycleState.SUSPENDED) { - throw new IncorrectParameterException("Use Activate/Suspend method to control state of the rule!"); - } - } - - validateFilters(rule.getFilters()); - if (rule.getProcessor() != null && !rule.getProcessor().isNull()) { - validateComponentJson(rule.getProcessor(), ComponentType.PROCESSOR); - } - if (rule.getAction() != null && !rule.getAction().isNull()) { - validateComponentJson(rule.getAction(), ComponentType.ACTION); - } - validateRuleAndPluginState(rule); - return ruleDao.save(rule); - } - - private void validateFilters(JsonNode filtersJson) { - if (filtersJson == null || filtersJson.isNull()) { - throw new IncorrectParameterException("Rule filters are required!"); - } - if (!filtersJson.isArray()) { - throw new IncorrectParameterException("Filters json is not an array!"); - } - ArrayNode filtersArray = (ArrayNode) filtersJson; - for (int i = 0; i < filtersArray.size(); i++) { - validateComponentJson(filtersArray.get(i), ComponentType.FILTER); - } - } - - private void validateComponentJson(JsonNode json, ComponentType type) { - if (json == null || json.isNull()) { - throw new IncorrectParameterException(type.name() + " is required!"); - } - String clazz = getIfValid(type.name(), json, "clazz", JsonNode::isTextual, JsonNode::asText); - String name = getIfValid(type.name(), json, "name", JsonNode::isTextual, JsonNode::asText); - JsonNode configuration = getIfValid(type.name(), json, "configuration", JsonNode::isObject, node -> node); - ComponentDescriptor descriptor = componentDescriptorService.findByClazz(clazz); - if (descriptor == null) { - throw new IncorrectParameterException(type.name() + " clazz " + clazz + " is not a valid component!"); - } - if (descriptor.getType() != type) { - throw new IncorrectParameterException("Clazz " + clazz + " is not a valid " + type.name() + " component!"); - } - if (!componentDescriptorService.validate(descriptor, configuration)) { - throw new IncorrectParameterException(type.name() + " configuration is not valid!"); - } + throw new RuntimeException("Not supported since v1.5!"); } private void validateRuleAndPluginState(RuleMetaData rule) { diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 07cd72c001..a1c85e2bfb 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -38,7 +38,7 @@ public interface TbContext { void spawn(TbMsg msg); - void ack(UUID msg); + void ack(TbMsg msg); AttributesService getAttributesService(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java index 9edd14c953..d1a4adc6b6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java @@ -44,6 +44,7 @@ public class TbTransformNode implements TbNode { try { //TODO: refactor this to work async and fetch attributes from cache. AttributesService service = ctx.getAttributesService(); + fetchAttributes(msg, service, config.getClientAttributeNames(), DataConstants.CLIENT_SCOPE, "cs."); fetchAttributes(msg, service, config.getServerAttributeNames(), DataConstants.SERVER_SCOPE, "ss."); fetchAttributes(msg, service, config.getSharedAttributeNames(), DataConstants.SHARED_SCOPE, "shared."); From 56248a2317630110be9822a508ef0e091962d6c3 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 20 Mar 2018 10:32:43 +0200 Subject: [PATCH 11/75] Adding License Header --- .../rule/engine/metadata/TbEntityGetAttrNode.java | 8 ++++---- .../TbGetRelatedAttrNodeConfiguration.java | 15 +++++++++++++++ .../metadata/TbGetRelatedAttributeNode.java | 15 +++++++++++++++ .../metadata/TbGetCustomerAttributeNodeTest.java | 8 ++++---- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java index 2d6641472c..52850be9a6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java index 40987daeaa..75b0a6524b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; import lombok.Data; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 596b1dfee5..5823c181de 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.metadata; import com.google.common.util.concurrent.AsyncFunction; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index 23c5d4b4ba..8e5ddb8069 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. From f51be6b2122bf2241e4577f7a18bd3a6a456dd38 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Tue, 20 Mar 2018 11:29:47 +0200 Subject: [PATCH 12/75] add filter & switch Nodes. add self get latest Telemetry. --- .../rule/engine/api/ListeningExecutor.java | 12 ++ .../rule/engine/api/TbContext.java | 2 + .../rule/engine/filter/TbJsFilterNode.java | 51 ++++++ .../filter/TbJsFilterNodeConfiguration.java | 9 + .../rule/engine/filter/TbJsSwitchNode.java | 56 +++++++ .../filter/TbJsSwitchNodeConfiguration.java | 12 ++ .../rule/engine/js/JsExecutorService.java | 30 ++++ .../rule/engine/js/NashornJsEngine.java | 79 +++++++++ .../engine/metadata/TbGetAttributesNode.java | 45 +++-- .../TbGetAttributesNodeConfiguration.java | 2 + .../engine/filter/TbJsFilterNodeTest.java | 154 ++++++++++++++++++ .../engine/filter/TbJsSwitchNodeTest.java | 118 ++++++++++++++ 12 files changed, 557 insertions(+), 13 deletions(-) create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java new file mode 100644 index 0000000000..a233cb36fc --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java @@ -0,0 +1,12 @@ +package org.thingsboard.rule.engine.api; + +import com.google.common.util.concurrent.ListenableFuture; + +import java.util.concurrent.Callable; + +public interface ListeningExecutor { + + ListenableFuture executeAsync(Callable task); + + void onDestroy(); +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 541d35b899..c7e2bec28c 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -74,4 +74,6 @@ public interface TbContext { RelationService getRelationService(); + ListeningExecutor getJsExecutor(); + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java new file mode 100644 index 0000000000..476695eb20 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -0,0 +1,51 @@ +package org.thingsboard.rule.engine.filter; + +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.msg.TbMsg; + +import javax.script.Bindings; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +@Slf4j +public class TbJsFilterNode implements TbNode { + + private TbJsFilterNodeConfiguration config; + private NashornJsEngine jsEngine; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbJsFilterNodeConfiguration.class); + this.jsEngine = new NashornJsEngine(config.getJsScript()); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + ListeningExecutor jsExecutor = ctx.getJsExecutor(); + withCallback(jsExecutor.executeAsync(() -> jsEngine.executeFilter(toBindings(msg))), + result -> processFilter(ctx, msg, result), + t -> ctx.tellError(msg, t)); + } + + private void processFilter(TbContext ctx, TbMsg msg, Boolean filterResult) { + if (filterResult) { + ctx.tellNext(msg); + } else { + log.debug("Msg filtered out {}", msg.getId()); + } + } + + private Bindings toBindings(TbMsg msg) { + return NashornJsEngine.bindMsg(msg); + } + + @Override + public void destroy() { + if (jsEngine != null) { + jsEngine.destroy(); + } + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java new file mode 100644 index 0000000000..488fa444d1 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java @@ -0,0 +1,9 @@ +package org.thingsboard.rule.engine.filter; + +import lombok.Data; + +@Data +public class TbJsFilterNodeConfiguration { + + private String jsScript; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java new file mode 100644 index 0000000000..5d1514a325 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -0,0 +1,56 @@ +package org.thingsboard.rule.engine.filter; + +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.msg.TbMsg; + +import javax.script.Bindings; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +@Slf4j +public class TbJsSwitchNode implements TbNode { + + private TbJsSwitchNodeConfiguration config; + private NashornJsEngine jsEngine; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbJsSwitchNodeConfiguration.class); + this.jsEngine = new NashornJsEngine(config.getJsScript()); + if (config.getAllowedRelations().size() < 1) { + String message = "Switch node should have at least 1 relation"; + log.error(message); + throw new IllegalStateException(message); + } + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + ListeningExecutor jsExecutor = ctx.getJsExecutor(); + withCallback(jsExecutor.executeAsync(() -> jsEngine.executeSwitch(toBindings(msg))), + result -> processSwitch(ctx, msg, result), + t -> ctx.tellError(msg, t)); + } + + private void processSwitch(TbContext ctx, TbMsg msg, String nextRelation) { + if (config.getAllowedRelations().contains(nextRelation)) { + ctx.tellNext(msg, nextRelation); + } else { + ctx.tellError(msg, new IllegalStateException("Unsupported relation for switch " + nextRelation)); + } + } + + private Bindings toBindings(TbMsg msg) { + return NashornJsEngine.bindMsg(msg); + } + + @Override + public void destroy() { + if (jsEngine != null) { + jsEngine.destroy(); + } + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java new file mode 100644 index 0000000000..a179c96a1f --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -0,0 +1,12 @@ +package org.thingsboard.rule.engine.filter; + +import lombok.Data; + +import java.util.Set; + +@Data +public class TbJsSwitchNodeConfiguration { + + private String jsScript; + private Set allowedRelations; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java new file mode 100644 index 0000000000..899188551f --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java @@ -0,0 +1,30 @@ +package org.thingsboard.rule.engine.js; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.thingsboard.rule.engine.api.ListeningExecutor; + +import javax.annotation.PreDestroy; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; + +public class JsExecutorService implements ListeningExecutor{ + + private final ListeningExecutorService service; + + public JsExecutorService(int threadCount) { + this.service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(threadCount)); + } + + @Override + public ListenableFuture executeAsync(Callable task) { + return service.submit(task); + } + + @PreDestroy + @Override + public void onDestroy() { + service.shutdown(); + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java new file mode 100644 index 0000000000..c64cf7202f --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -0,0 +1,79 @@ +package org.thingsboard.rule.engine.js; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import jdk.nashorn.api.scripting.NashornScriptEngineFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ArrayUtils; +import org.thingsboard.server.common.msg.TbMsg; + +import javax.script.*; +import java.util.Map; + + +@Slf4j +public class NashornJsEngine { + + public static final String METADATA = "meta"; + public static final String DATA = "msg"; + private static NashornScriptEngineFactory factory = new NashornScriptEngineFactory(); + + private CompiledScript engine; + + public NashornJsEngine(String script) { + engine = compileScript(script); + } + + private static CompiledScript compileScript(String script) { + ScriptEngine engine = factory.getScriptEngine(new String[]{"--no-java"}); + Compilable compEngine = (Compilable) engine; + try { + return compEngine.compile(script); + } catch (ScriptException e) { + log.warn("Failed to compile JS script: {}", e.getMessage(), e); + throw new IllegalArgumentException("Can't compile script: " + e.getMessage()); + } + } + + public static Bindings bindMsg(TbMsg msg) { + try { + Bindings bindings = new SimpleBindings(); + bindings.put(METADATA, msg.getMetaData().getData()); + + if (ArrayUtils.isNotEmpty(msg.getData())) { + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = mapper.readTree(msg.getData()); + Map map = mapper.treeToValue(jsonNode, Map.class); + bindings.put(DATA, map); + } + + return bindings; + } catch (Throwable th) { + throw new IllegalArgumentException("Cannot bind js args", th); + } + } + + public boolean executeFilter(Bindings bindings) throws ScriptException { + Object eval = engine.eval(bindings); + if (eval instanceof Boolean) { + return (boolean) eval; + } else { + log.warn("Wrong result type: {}", eval); + throw new ScriptException("Wrong result type: " + eval); + } + } + + public String executeSwitch(Bindings bindings) throws ScriptException, NoSuchMethodException { + Object eval = this.engine.eval(bindings); + if (eval instanceof String) { + return (String) eval; + } else { + log.warn("Wrong result type: {}", eval); + throw new ScriptException("Wrong result type: " + eval); + } + } + + public void destroy() { + engine = null; + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 4d41921740..bc6bc4a03c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,13 +15,16 @@ */ package org.thingsboard.rule.engine.metadata; -import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; import java.util.List; @@ -44,24 +47,40 @@ public class TbGetAttributesNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException { - ListenableFuture> future = Futures.allAsList( - putAttrAsync(ctx, msg, CLIENT_SCOPE, config.getClientAttributeNames(), "cs."), - putAttrAsync(ctx, msg, SHARED_SCOPE, config.getSharedAttributeNames(), "shared."), - putAttrAsync(ctx, msg, SERVER_SCOPE, config.getServerAttributeNames(), "ss.")); + if (CollectionUtils.isNotEmpty(config.getLatestTsKeyNames())) { + withCallback(getLatestTelemetry(ctx, msg, config.getLatestTsKeyNames()), + i -> ctx.tellNext(msg), + t -> ctx.tellError(msg, t)); + } else { + ListenableFuture> future = Futures.allAsList( + putAttrAsync(ctx, msg, CLIENT_SCOPE, config.getClientAttributeNames(), "cs."), + putAttrAsync(ctx, msg, SHARED_SCOPE, config.getSharedAttributeNames(), "shared."), + putAttrAsync(ctx, msg, SERVER_SCOPE, config.getServerAttributeNames(), "ss.")); - withCallback(future, i -> ctx.tellNext(msg), t -> ctx.tellError(msg, t)); + withCallback(future, i -> ctx.tellNext(msg), t -> ctx.tellError(msg, t)); + } } - private ListenableFuture putAttributesAsync(TbMsg msg, List attributes, String prefix) { + private ListenableFuture putAttr(TbMsg msg, List attributes, String prefix) { attributes.forEach(r -> msg.getMetaData().putValue(prefix + r.getKey(), r.getValueAsString())); return Futures.immediateFuture(null); } private ListenableFuture putAttrAsync(TbContext ctx, TbMsg msg, String scope, List attributes, String prefix) { - return Futures.transform(ctx.getAttributesService().find(msg.getOriginator(), scope, attributes), - (AsyncFunction, Void>) i -> putAttributesAsync(msg, i, prefix)); + ListenableFuture> latest = ctx.getAttributesService().find(msg.getOriginator(), scope, attributes); + return Futures.transform(latest, (Function, Void>) l -> { + l.forEach(r -> msg.getMetaData().putValue(prefix + r.getKey(), r.getValueAsString())); + return null; + }); } + private ListenableFuture getLatestTelemetry(TbContext ctx, TbMsg msg, List attributes) { + ListenableFuture> latest = ctx.getTimeseriesService().findLatest(msg.getOriginator(), attributes); + return Futures.transform(latest, (Function, Void>) l -> { + l.forEach(r -> msg.getMetaData().putValue(r.getKey(), r.getValueAsString())); + return null; + }); + } @Override public void destroy() { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java index b54edef818..ad92314324 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java @@ -29,4 +29,6 @@ public class TbGetAttributesNodeConfiguration { private List sharedAttributeNames; private List serverAttributeNames; + private List latestTsKeyNames; + } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java new file mode 100644 index 0000000000..6a4bec2d66 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -0,0 +1,154 @@ +package org.thingsboard.rule.engine.filter; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; +import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import javax.script.ScriptException; +import java.util.concurrent.Callable; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.*; + +@RunWith(MockitoJUnitRunner.class) +public class TbJsFilterNodeTest { + + private TbJsFilterNode node; + + @Mock + private TbContext ctx; + @Mock + private ListeningExecutor executor; + + @Test + public void falseEvaluationDoNotSendMsg() throws TbNodeException { + initWithScript("10 > 15;"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}".getBytes()); + + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verifyNoMoreInteractions(ctx); + } + + @Test + public void notValidMsgDataThrowsException() throws TbNodeException { + initWithScript("10 > 15;"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), new byte[4]); + + when(ctx.getJsExecutor()).thenReturn(executor); + + mockJsExecutor(); + + node.onMsg(ctx, msg); + verifyError(msg, "Cannot bind js args", IllegalArgumentException.class); + } + + @Test + public void exceptionInJsThrowsException() throws TbNodeException { + initWithScript("meta.temp.curr < 15;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + String expectedMessage = "TypeError: Cannot get property \"curr\" of null in at line number 1"; + verifyError(msg, expectedMessage, ScriptException.class); + } + + @Test(expected = IllegalArgumentException.class) + public void notValidScriptThrowsException() throws TbNodeException { + initWithScript("10 > 15 asdq out"); + } + + @Test + public void metadataConditionCanBeFalse() throws TbNodeException { + initWithScript("meta.humidity < 15;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verifyNoMoreInteractions(ctx); + } + + @Test + public void metadataConditionCanBeTrue() throws TbNodeException { + initWithScript("meta.temp < 15;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg); + } + + @Test + public void msgJsonParsedAndBinded() throws TbNodeException { + initWithScript("msg.passed < 15 && msg.name === 'Vit' && meta.temp == 10 && msg.bigObj.prop == 42;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg); + } + + private void initWithScript(String script) throws TbNodeException { + TbJsFilterNodeConfiguration config = new TbJsFilterNodeConfiguration(); + config.setJsScript(script); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbJsFilterNode(); + node.init(nodeConfiguration, null); + } + + private void mockJsExecutor() { + when(ctx.getJsExecutor()).thenReturn(executor); + doAnswer((Answer>) invocationOnMock -> { + try { + Callable task = (Callable) (invocationOnMock.getArguments())[0]; + return Futures.immediateFuture((Boolean) task.call()); + } catch (Throwable th) { + return Futures.immediateFailedFuture(th); + } + }).when(executor).executeAsync(Matchers.any(Callable.class)); + } + + private void verifyError(TbMsg msg, String message, Class expectedClass) { + ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals(expectedClass, value.getClass()); + assertEquals(message, value.getMessage()); + } +} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java new file mode 100644 index 0000000000..6ffa83bcc4 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -0,0 +1,118 @@ +package org.thingsboard.rule.engine.filter; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; +import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import java.util.Set; +import java.util.concurrent.Callable; + +import static org.junit.Assert.*; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class TbJsSwitchNodeTest { + + private TbJsSwitchNode node; + + @Mock + private TbContext ctx; + @Mock + private ListeningExecutor executor; + + @Test + public void allowedRelationPassed() throws TbNodeException { + String jsCode = "function nextRelation(meta, msg) {\n" + + " if(msg.passed == 5 && meta.temp == 10)\n" + + " return 'one'\n" + + " else\n" + + " return 'two';\n" + + "};\n" + + "\n" + + "nextRelation(meta, msg);"; + initWithScript(jsCode, Sets.newHashSet("one", "two")); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg, "one"); + } + + @Test + public void unknownRelationThrowsException() throws TbNodeException { + String jsCode = "function nextRelation(meta, msg) {\n" + + " return 'nine';" + + "};\n" + + "\n" + + "nextRelation(meta, msg);"; + initWithScript(jsCode, Sets.newHashSet("one", "two")); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verifyError(msg, "Unsupported relation for switch nine", IllegalStateException.class); + } + + private void initWithScript(String script, Set relations) throws TbNodeException { + TbJsSwitchNodeConfiguration config = new TbJsSwitchNodeConfiguration(); + config.setJsScript(script); + config.setAllowedRelations(relations); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbJsSwitchNode(); + node.init(nodeConfiguration, null); + } + + private void mockJsExecutor() { + when(ctx.getJsExecutor()).thenReturn(executor); + doAnswer((Answer>) invocationOnMock -> { + try { + Callable task = (Callable) (invocationOnMock.getArguments())[0]; + return Futures.immediateFuture((String) task.call()); + } catch (Throwable th) { + return Futures.immediateFailedFuture(th); + } + }).when(executor).executeAsync(Matchers.any(Callable.class)); + } + + private void verifyError(TbMsg msg, String message, Class expectedClass) { + ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals(expectedClass, value.getClass()); + assertEquals(message, value.getMessage()); + } +} \ No newline at end of file From 09c690634b1f03c818632fb6867ffda08e4688c8 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Tue, 20 Mar 2018 11:31:31 +0200 Subject: [PATCH 13/75] fix license header --- .../rule/engine/api/ListeningExecutor.java | 15 +++++++++++++++ .../rule/engine/filter/TbJsFilterNode.java | 15 +++++++++++++++ .../filter/TbJsFilterNodeConfiguration.java | 15 +++++++++++++++ .../rule/engine/filter/TbJsSwitchNode.java | 15 +++++++++++++++ .../filter/TbJsSwitchNodeConfiguration.java | 15 +++++++++++++++ .../rule/engine/js/JsExecutorService.java | 15 +++++++++++++++ .../rule/engine/js/NashornJsEngine.java | 15 +++++++++++++++ .../rule/engine/metadata/TbGetAttributesNode.java | 8 ++++---- .../rule/engine/filter/TbJsFilterNodeTest.java | 15 +++++++++++++++ .../rule/engine/filter/TbJsSwitchNodeTest.java | 15 +++++++++++++++ 10 files changed, 139 insertions(+), 4 deletions(-) diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java index a233cb36fc..fecf019425 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; import com.google.common.util.concurrent.ListenableFuture; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 476695eb20..4972bc6452 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import lombok.extern.slf4j.Slf4j; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java index 488fa444d1..bf543e3276 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import lombok.Data; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 5d1514a325..9dcb3325aa 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import lombok.extern.slf4j.Slf4j; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java index a179c96a1f..d0e2a51b2d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import lombok.Data; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java index 899188551f..19c2bb9405 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.js; import com.google.common.util.concurrent.ListenableFuture; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java index c64cf7202f..a40d4ecb0c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.js; import com.fasterxml.jackson.databind.JsonNode; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index bc6bc4a03c..887311cc9a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java index 6a4bec2d66..6a9146de98 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import com.datastax.driver.core.utils.UUIDs; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index 6ffa83bcc4..1b4cce9fc9 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.filter; import com.datastax.driver.core.utils.UUIDs; From 872a2065aba77413ffde3c61b9c530f262e10385 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 20 Mar 2018 11:39:31 +0200 Subject: [PATCH 14/75] Fix cache issue for relation service --- .../dao/relation/BaseRelationService.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java index 01f60f8dff..370d770188 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java @@ -82,8 +82,9 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}") }) @@ -95,8 +96,9 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}") }) @@ -108,11 +110,11 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}") + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}") }) @Override public boolean deleteRelation(EntityRelation relation) { @@ -122,11 +124,11 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#relation.from"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#relation.to"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}") + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.to, #relation.type, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.type, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.from, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#relation.to, #relation.type, #relation.typeGroup}") }) @Override public ListenableFuture deleteRelationAsync(EntityRelation relation) { @@ -136,11 +138,11 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#from"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#to"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType}") + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType, #typeGroup}") }) @Override public boolean deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { @@ -150,11 +152,11 @@ public class BaseRelationService implements RelationService { } @Caching(evict = { - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#from"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "#to"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType}"), - @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType}") + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #to, #relationType, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #relationType, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}"), + @CacheEvict(cacheNames = RELATIONS_CACHE, key = "{#to, #relationType, #typeGroup}") }) @Override public ListenableFuture deleteRelationAsync(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { From 1968b5d8423d6b5af57ae3603c2d77a06664ece2 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Tue, 20 Mar 2018 15:10:09 +0200 Subject: [PATCH 15/75] implement Transformation Nodes --- .../thingsboard/server/common/msg/TbMsg.java | 8 +- .../rule/engine/api/TbContext.java | 3 + .../rule/engine/filter/TbJsFilterNode.java | 10 +- .../rule/engine/filter/TbJsSwitchNode.java | 21 ++- .../filter/TbJsSwitchNodeConfiguration.java | 1 + .../rule/engine/js/NashornJsEngine.java | 55 ++++++- .../engine/metadata/TbEntityGetAttrNode.java | 6 +- .../metadata/TbGetCustomerAttributeNode.java | 28 +--- .../TbGetRelatedAttrNodeConfiguration.java | 2 +- .../metadata/TbGetRelatedAttributeNode.java | 27 +--- .../metadata/TbGetTenantAttributeNode.java | 39 +---- .../transform/TbAbstractTransformNode.java | 59 ++++++++ .../transform/TbChangeOriginatorNode.java | 93 ++++++++++++ .../TbChangeOriginatorNodeConfiguration.java | 27 ++++ .../engine/transform/TbTransformMsgNode.java | 56 +++++++ .../TbTransformMsgNodeConfiguration.java | 24 +++ .../engine/transform/TbTransformNode.java | 68 --------- .../TbTransformNodeConfiguration.java | 24 +++ .../util/EntitiesCustomerIdAsyncLoader.java | 50 +++++++ .../EntitiesRelatedEntityIdAsyncLoader.java | 51 +++++++ .../util/EntitiesTenantIdAsyncLoader.java | 60 ++++++++ .../engine/filter/TbJsFilterNodeTest.java | 6 +- .../engine/filter/TbJsSwitchNodeTest.java | 59 ++++++-- .../transform/TbChangeOriginatorNodeTest.java | 125 ++++++++++++++++ .../transform/TbTransformMsgNodeTest.java | 141 ++++++++++++++++++ 25 files changed, 856 insertions(+), 187 deletions(-) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java delete mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesCustomerIdAsyncLoader.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java index 5163b6c39d..261dda7670 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java @@ -30,7 +30,7 @@ import java.util.UUID; * Created by ashvayka on 13.01.18. */ @Data -public final class TbMsg implements Serializable { +public final class TbMsg implements Serializable, Cloneable { private final UUID id; private final String type; @@ -39,6 +39,11 @@ public final class TbMsg implements Serializable { private final byte[] data; + @Override + public TbMsg clone() { + return fromBytes(toBytes(this)); + } + public static ByteBuffer toBytes(TbMsg msg) { MsgProtos.TbMsgProto.Builder builder = MsgProtos.TbMsgProto.newBuilder(); builder.setId(msg.getId().toString()); @@ -77,4 +82,5 @@ public final class TbMsg implements Serializable { throw new IllegalStateException("Could not parse protobuf for TbMsg", e); } } + } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index c7e2bec28c..fdcf56aac9 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -29,6 +29,7 @@ import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; +import java.util.Set; import java.util.UUID; /** @@ -40,6 +41,8 @@ public interface TbContext { void tellNext(TbMsg msg, String relationType); + void tellNext(TbMsg msg, Set relationTypes); + void tellSelf(TbMsg msg, long delayMs); void tellOthers(TbMsg msg); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 4972bc6452..089c9b1919 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -41,18 +41,10 @@ public class TbJsFilterNode implements TbNode { public void onMsg(TbContext ctx, TbMsg msg) { ListeningExecutor jsExecutor = ctx.getJsExecutor(); withCallback(jsExecutor.executeAsync(() -> jsEngine.executeFilter(toBindings(msg))), - result -> processFilter(ctx, msg, result), + filterResult -> ctx.tellNext(msg, Boolean.toString(filterResult)), t -> ctx.tellError(msg, t)); } - private void processFilter(TbContext ctx, TbMsg msg, Boolean filterResult) { - if (filterResult) { - ctx.tellNext(msg); - } else { - log.debug("Msg filtered out {}", msg.getId()); - } - } - private Bindings toBindings(TbMsg msg) { return NashornJsEngine.bindMsg(msg); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 9dcb3325aa..afd81636a0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -22,6 +22,7 @@ import org.thingsboard.rule.engine.js.NashornJsEngine; import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; +import java.util.Set; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @@ -34,30 +35,40 @@ public class TbJsSwitchNode implements TbNode { @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsSwitchNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript()); if (config.getAllowedRelations().size() < 1) { String message = "Switch node should have at least 1 relation"; log.error(message); throw new IllegalStateException(message); } + if (!config.isRouteToAllWithNoCheck()) { + this.jsEngine = new NashornJsEngine(config.getJsScript()); + } } @Override public void onMsg(TbContext ctx, TbMsg msg) { + if (config.isRouteToAllWithNoCheck()) { + ctx.tellNext(msg, config.getAllowedRelations()); + return; + } ListeningExecutor jsExecutor = ctx.getJsExecutor(); withCallback(jsExecutor.executeAsync(() -> jsEngine.executeSwitch(toBindings(msg))), result -> processSwitch(ctx, msg, result), t -> ctx.tellError(msg, t)); } - private void processSwitch(TbContext ctx, TbMsg msg, String nextRelation) { - if (config.getAllowedRelations().contains(nextRelation)) { - ctx.tellNext(msg, nextRelation); + private void processSwitch(TbContext ctx, TbMsg msg, Set nextRelations) { + if (validateRelations(nextRelations)) { + ctx.tellNext(msg, nextRelations); } else { - ctx.tellError(msg, new IllegalStateException("Unsupported relation for switch " + nextRelation)); + ctx.tellError(msg, new IllegalStateException("Unsupported relation for switch " + nextRelations)); } } + private boolean validateRelations(Set nextRelations) { + return config.getAllowedRelations().containsAll(nextRelations); + } + private Bindings toBindings(TbMsg msg) { return NashornJsEngine.bindMsg(msg); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java index d0e2a51b2d..331302d542 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -24,4 +24,5 @@ public class TbJsSwitchNodeConfiguration { private String jsScript; private Set allowedRelations; + private boolean routeToAllWithNoCheck; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java index a40d4ecb0c..082535f0fe 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -15,15 +15,20 @@ */ package org.thingsboard.rule.engine.js; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Sets; import jdk.nashorn.api.scripting.NashornScriptEngineFactory; +import jdk.nashorn.api.scripting.ScriptObjectMirror; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.thingsboard.server.common.msg.TbMsg; import javax.script.*; +import java.util.Collections; import java.util.Map; +import java.util.Set; @Slf4j @@ -68,6 +73,32 @@ public class NashornJsEngine { } } + private static TbMsg unbindMsg(Bindings bindings, TbMsg msg) throws JsonProcessingException { + for (Map.Entry entry : msg.getMetaData().getData().entrySet()) { + Object obj = entry.getValue(); + entry.setValue(obj.toString()); + } + + Object payload = bindings.get(DATA); + if (payload != null) { + ObjectMapper mapper = new ObjectMapper(); + byte[] bytes = mapper.writeValueAsBytes(payload); + return new TbMsg(msg.getId(), msg.getType(), msg.getOriginator(), msg.getMetaData(), bytes); + } + + return msg; + } + + public TbMsg executeUpdate(Bindings bindings, TbMsg msg) throws ScriptException { + try { + engine.eval(bindings); + return unbindMsg(bindings, msg); + } catch (Throwable th) { + th.printStackTrace(); + throw new IllegalArgumentException("Cannot unbind js args", th); + } + } + public boolean executeFilter(Bindings bindings) throws ScriptException { Object eval = engine.eval(bindings); if (eval instanceof Boolean) { @@ -78,14 +109,28 @@ public class NashornJsEngine { } } - public String executeSwitch(Bindings bindings) throws ScriptException, NoSuchMethodException { + public Set executeSwitch(Bindings bindings) throws ScriptException, NoSuchMethodException { Object eval = this.engine.eval(bindings); if (eval instanceof String) { - return (String) eval; - } else { - log.warn("Wrong result type: {}", eval); - throw new ScriptException("Wrong result type: " + eval); + return Collections.singleton((String) eval); + } else if (eval instanceof ScriptObjectMirror) { + ScriptObjectMirror mir = (ScriptObjectMirror) eval; + if (mir.isArray()) { + Set nextStates = Sets.newHashSet(); + for (Map.Entry entry : mir.entrySet()) { + if (entry.getValue() instanceof String) { + nextStates.add((String) entry.getValue()); + } else { + log.warn("Wrong result type: {}", eval); + throw new ScriptException("Wrong result type: " + eval); + } + } + return nextStates; + } } + + log.warn("Wrong result type: {}", eval); + throw new ScriptException("Wrong result type: " + eval); } public void destroy() { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java index 52850be9a6..269e40fc19 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -70,7 +70,7 @@ public abstract class TbEntityGetAttrNode implements TbNode } - private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { + private void putAttributesAndTell(TbContext ctx, TbMsg msg, List attributes) { attributes.forEach(r -> { String attrName = config.getAttrMapping().get(r.getKey()); msg.getMetaData().putValue(attrName, r.getValueAsString()); @@ -85,4 +85,8 @@ public abstract class TbEntityGetAttrNode implements TbNode protected abstract ListenableFuture findEntityAsync(TbContext ctx, EntityId originator); + public void setConfig(TbGetEntityAttrNodeConfiguration config) { + this.config = config; + } + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index 57f9b79e7b..b7b1fd73a3 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -15,37 +15,17 @@ */ package org.thingsboard.rule.engine.metadata; -import com.google.common.util.concurrent.AsyncFunction; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.server.common.data.HasCustomerId; -import org.thingsboard.server.common.data.id.*; +import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EntityId; public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { - - switch (originator.getEntityType()) { - case CUSTOMER: - return Futures.immediateFuture((CustomerId) originator); - case USER: - return getCustomerAsync(ctx.getUserService().findUserByIdAsync((UserId) originator)); - case ASSET: - return getCustomerAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) originator)); - case DEVICE: - return getCustomerAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) originator)); - default: - return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType " + originator)); - } - } - - private ListenableFuture getCustomerAsync(ListenableFuture future) { - return Futures.transform(future, (AsyncFunction) in -> { - return in != null ? Futures.immediateFuture(in.getCustomerId()) - : Futures.immediateFailedFuture(new IllegalStateException("Customer not found"));}); + return EntitiesCustomerIdAsyncLoader.findEntityIdAsync(ctx, originator); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java index 75b0a6524b..ae0b662d48 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java @@ -19,7 +19,7 @@ import lombok.Data; import org.thingsboard.server.common.data.relation.EntitySearchDirection; @Data -public class TbGetRelatedAttrNodeConfiguration { +public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfiguration { private String relationType; private EntitySearchDirection direction; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 5823c181de..474fb5d6c0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -15,23 +15,14 @@ */ package org.thingsboard.rule.engine.metadata; -import com.google.common.util.concurrent.AsyncFunction; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.commons.collections.CollectionUtils; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNodeConfiguration; import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.relation.EntityRelation; -import org.thingsboard.server.common.data.relation.EntitySearchDirection; -import org.thingsboard.server.dao.relation.RelationService; - -import java.util.List; - -import static org.thingsboard.server.common.data.relation.RelationTypeGroup.COMMON; public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { @@ -40,23 +31,11 @@ public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbGetRelatedAttrNodeConfiguration.class); + setConfig(config); } @Override protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { - RelationService relationService = ctx.getRelationService(); - if (config.getDirection() == EntitySearchDirection.FROM) { - ListenableFuture> asyncRelation = relationService.findByFromAndTypeAsync(originator, config.getRelationType(), COMMON); - return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) - r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getTo()) - : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); - } else if (config.getDirection() == EntitySearchDirection.TO) { - ListenableFuture> asyncRelation = relationService.findByToAndTypeAsync(originator, config.getRelationType(), COMMON); - return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) - r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getFrom()) - : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); - } - - return Futures.immediateFailedFuture(new IllegalStateException("Unknown direction")); + return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, originator, config.getDirection(), config.getRelationType()); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index 2cf9a97d20..b97e220c04 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -15,50 +15,19 @@ */ package org.thingsboard.rule.engine.metadata; -import com.google.common.util.concurrent.AsyncFunction; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.server.common.data.HasTenantId; -import org.thingsboard.server.common.data.alarm.AlarmId; -import org.thingsboard.server.common.data.id.*; +import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; @Slf4j public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { - - switch (originator.getEntityType()) { - case TENANT: - return Futures.immediateFuture((TenantId) originator); - case CUSTOMER: - return getTenantAsync(ctx.getCustomerService().findCustomerByIdAsync((CustomerId) originator)); - case USER: - return getTenantAsync(ctx.getUserService().findUserByIdAsync((UserId) originator)); - case RULE: - return getTenantAsync(ctx.getRuleService().findRuleByIdAsync((RuleId) originator)); - case PLUGIN: - return getTenantAsync(ctx.getPluginService().findPluginByIdAsync((PluginId) originator)); - case ASSET: - return getTenantAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) originator)); - case DEVICE: - return getTenantAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) originator)); - case ALARM: - return getTenantAsync(ctx.getAlarmService().findAlarmByIdAsync((AlarmId) originator)); - case RULE_CHAIN: - return getTenantAsync(ctx.getRuleChainService().findRuleChainByIdAsync((RuleChainId) originator)); - default: - return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType " + originator)); - } - } - - private ListenableFuture getTenantAsync(ListenableFuture future) { - return Futures.transform(future, (AsyncFunction) in -> { - return in != null ? Futures.immediateFuture(in.getTenantId()) - : Futures.immediateFailedFuture(new IllegalStateException("Tenant not found"));}); + return EntitiesTenantIdAsyncLoader.findEntityIdAsync(ctx, originator); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java new file mode 100644 index 0000000000..426a3276a9 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java @@ -0,0 +1,59 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.msg.TbMsg; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +/** + * Created by ashvayka on 19.01.18. + */ +@Slf4j +public abstract class TbAbstractTransformNode implements TbNode { + + private TbTransformNodeConfiguration config; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbTransformNodeConfiguration.class); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + withCallback(transform(ctx, msg), + m -> routeMsg(ctx, m), + t -> ctx.tellError(msg, t)); + } + + protected abstract ListenableFuture transform(TbContext ctx, TbMsg msg); + + private void routeMsg(TbContext ctx, TbMsg msg) { + if (config.isStartNewChain()) { + ctx.spawn(msg); + } else { + ctx.tellNext(msg); + } + } + + public void setConfig(TbTransformNodeConfiguration config) { + this.config = config; + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java new file mode 100644 index 0000000000..2592af253e --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -0,0 +1,93 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import com.google.common.base.Function; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; +import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; +import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.msg.TbMsg; + +import java.util.HashSet; + +@Slf4j +public class TbChangeOriginatorNode extends TbAbstractTransformNode { + + protected static final String CUSTOMER_SOURCE = "CUSTOMER"; + protected static final String TENANT_SOURCE = "TENANT"; + protected static final String RELATED_SOURCE = "RELATED"; + + private TbChangeOriginatorNodeConfiguration config; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbChangeOriginatorNodeConfiguration.class); + validateConfig(config); + setConfig(config); + } + + @Override + protected ListenableFuture transform(TbContext ctx, TbMsg msg) { + ListenableFuture newOriginator = getNewOriginator(ctx, msg.getOriginator()); + return Futures.transform(newOriginator, (Function) n -> new TbMsg(msg.getId(), msg.getType(), n, msg.getMetaData(), msg.getData())); + } + + private ListenableFuture getNewOriginator(TbContext ctx, EntityId original) { + switch (config.getOriginatorSource()) { + case CUSTOMER_SOURCE: + return EntitiesCustomerIdAsyncLoader.findEntityIdAsync(ctx, original); + case TENANT_SOURCE: + return EntitiesTenantIdAsyncLoader.findEntityIdAsync(ctx, original); + case RELATED_SOURCE: + return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, original, config.getDirection(), config.getRelationType()); + default: + return Futures.immediateFailedFuture(new IllegalStateException("Unexpected originator source " + config.getOriginatorSource())); + } + } + + private void validateConfig(TbChangeOriginatorNodeConfiguration conf) { + HashSet knownSources = Sets.newHashSet(CUSTOMER_SOURCE, TENANT_SOURCE, RELATED_SOURCE); + if (!knownSources.contains(conf.getOriginatorSource())) { + log.error("Unsupported source [{}] for TbChangeOriginatorNode", conf.getOriginatorSource()); + throw new IllegalArgumentException("Unsupported source TbChangeOriginatorNode" + conf.getOriginatorSource()); + } + + if (conf.getOriginatorSource().equals(RELATED_SOURCE)) { + if (conf.getDirection() == null || StringUtils.isBlank(conf.getRelationType())) { + log.error("Related source for TbChangeOriginatorNode should have direction and relationType. Actual [{}] [{}]", + conf.getDirection(), conf.getRelationType()); + throw new IllegalArgumentException("Wrong config for RElated Source in TbChangeOriginatorNode" + conf.getOriginatorSource()); + } + } + + } + + @Override + public void destroy() { + + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java new file mode 100644 index 0000000000..cf036810c4 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java @@ -0,0 +1,27 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import lombok.Data; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; + +@Data +public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfiguration{ + + private String originatorSource; + private EntitySearchDirection direction; + private String relationType; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java new file mode 100644 index 0000000000..241fbfbf7e --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -0,0 +1,56 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.msg.TbMsg; + +import javax.script.Bindings; + +public class TbTransformMsgNode extends TbAbstractTransformNode { + + private TbTransformMsgNodeConfiguration config; + private NashornJsEngine jsEngine; + + @Override + public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class); + this.jsEngine = new NashornJsEngine(config.getJsScript()); + setConfig(config); + } + + @Override + protected ListenableFuture transform(TbContext ctx, TbMsg msg) { + return ctx.getJsExecutor().executeAsync(() -> jsEngine.executeUpdate(toBindings(msg), msg)); + } + + private Bindings toBindings(TbMsg msg) { + return NashornJsEngine.bindMsg(msg); + } + + @Override + public void destroy() { + if (jsEngine != null) { + jsEngine.destroy(); + } + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java new file mode 100644 index 0000000000..9cc926b54d --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import lombok.Data; + +@Data +public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguration { + + private String jsScript; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java deleted file mode 100644 index 9edd14c953..0000000000 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNode.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright © 2016-2018 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.rule.engine.transform; - -import lombok.extern.slf4j.Slf4j; -import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.*; -import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration; -import org.thingsboard.server.common.data.DataConstants; -import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.msg.TbMsg; -import org.thingsboard.server.dao.attributes.AttributesService; - -import java.util.List; - -/** - * Created by ashvayka on 19.01.18. - */ -@Slf4j -public class TbTransformNode implements TbNode { - - TbGetAttributesNodeConfiguration config; - - @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { - this.config = TbNodeUtils.convert(configuration, TbGetAttributesNodeConfiguration.class); - } - - @Override - public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException { - try { - //TODO: refactor this to work async and fetch attributes from cache. - AttributesService service = ctx.getAttributesService(); - fetchAttributes(msg, service, config.getClientAttributeNames(), DataConstants.CLIENT_SCOPE, "cs."); - fetchAttributes(msg, service, config.getServerAttributeNames(), DataConstants.SERVER_SCOPE, "ss."); - fetchAttributes(msg, service, config.getSharedAttributeNames(), DataConstants.SHARED_SCOPE, "shared."); - ctx.tellNext(msg); - } catch (Exception e) { - log.warn("[{}][{}] Failed to fetch attributes", msg.getOriginator(), msg.getId(), e); - throw new TbNodeException(e); - } - } - - private void fetchAttributes(TbMsg msg, AttributesService service, List attributeNames, String scope, String prefix) throws InterruptedException, java.util.concurrent.ExecutionException { - if (attributeNames != null && attributeNames.isEmpty()) { - List attributes = service.find(msg.getOriginator(), scope, attributeNames).get(); - attributes.forEach(attr -> msg.getMetaData().putValue(prefix + attr.getKey(), attr.getValueAsString())); - } - } - - @Override - public void destroy() { - - } -} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNodeConfiguration.java new file mode 100644 index 0000000000..d9f57806ae --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNodeConfiguration.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import lombok.Data; + +@Data +public class TbTransformNodeConfiguration { + + private boolean startNewChain = false; +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesCustomerIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesCustomerIdAsyncLoader.java new file mode 100644 index 0000000000..67eb808795 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesCustomerIdAsyncLoader.java @@ -0,0 +1,50 @@ +/** + * Copyright © 2016-2018 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.rule.engine.util; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.HasCustomerId; +import org.thingsboard.server.common.data.id.*; + +public class EntitiesCustomerIdAsyncLoader { + + + public static ListenableFuture findEntityIdAsync(TbContext ctx, EntityId original) { + + switch (original.getEntityType()) { + case CUSTOMER: + return Futures.immediateFuture((CustomerId) original); + case USER: + return getCustomerAsync(ctx.getUserService().findUserByIdAsync((UserId) original)); + case ASSET: + return getCustomerAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) original)); + case DEVICE: + return getCustomerAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) original)); + default: + return Futures.immediateFailedFuture(new TbNodeException("Unexpected original EntityType " + original)); + } + } + + private static ListenableFuture getCustomerAsync(ListenableFuture future) { + return Futures.transform(future, (AsyncFunction) in -> { + return in != null ? Futures.immediateFuture(in.getCustomerId()) + : Futures.immediateFailedFuture(new IllegalStateException("Customer not found"));}); + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java new file mode 100644 index 0000000000..ac69c5dd59 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java @@ -0,0 +1,51 @@ +/** + * Copyright © 2016-2018 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.rule.engine.util; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.apache.commons.collections.CollectionUtils; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.dao.relation.RelationService; + +import java.util.List; + +import static org.thingsboard.server.common.data.relation.RelationTypeGroup.COMMON; + +public class EntitiesRelatedEntityIdAsyncLoader { + + public static ListenableFuture findEntityAsync(TbContext ctx, EntityId originator, + EntitySearchDirection direction, String relationType) { + RelationService relationService = ctx.getRelationService(); + if (direction == EntitySearchDirection.FROM) { + ListenableFuture> asyncRelation = relationService.findByFromAndTypeAsync(originator, relationType, COMMON); + return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) + r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getTo()) + : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); + } else if (direction == EntitySearchDirection.TO) { + ListenableFuture> asyncRelation = relationService.findByToAndTypeAsync(originator, relationType, COMMON); + return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) + r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getFrom()) + : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); + } + + return Futures.immediateFailedFuture(new IllegalStateException("Unknown direction")); + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java new file mode 100644 index 0000000000..388881b84e --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java @@ -0,0 +1,60 @@ +/** + * Copyright © 2016-2018 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.rule.engine.util; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.HasTenantId; +import org.thingsboard.server.common.data.alarm.AlarmId; +import org.thingsboard.server.common.data.id.*; + +public class EntitiesTenantIdAsyncLoader { + + public static ListenableFuture findEntityIdAsync(TbContext ctx, EntityId original) { + + switch (original.getEntityType()) { + case TENANT: + return Futures.immediateFuture((TenantId) original); + case CUSTOMER: + return getTenantAsync(ctx.getCustomerService().findCustomerByIdAsync((CustomerId) original)); + case USER: + return getTenantAsync(ctx.getUserService().findUserByIdAsync((UserId) original)); + case RULE: + return getTenantAsync(ctx.getRuleService().findRuleByIdAsync((RuleId) original)); + case PLUGIN: + return getTenantAsync(ctx.getPluginService().findPluginByIdAsync((PluginId) original)); + case ASSET: + return getTenantAsync(ctx.getAssetService().findAssetByIdAsync((AssetId) original)); + case DEVICE: + return getTenantAsync(ctx.getDeviceService().findDeviceByIdAsync((DeviceId) original)); + case ALARM: + return getTenantAsync(ctx.getAlarmService().findAlarmByIdAsync((AlarmId) original)); + case RULE_CHAIN: + return getTenantAsync(ctx.getRuleChainService().findRuleChainByIdAsync((RuleChainId) original)); + default: + return Futures.immediateFailedFuture(new TbNodeException("Unexpected original EntityType " + original)); + } + } + + private static ListenableFuture getTenantAsync(ListenableFuture future) { + return Futures.transform(future, (AsyncFunction) in -> { + return in != null ? Futures.immediateFuture(in.getTenantId()) + : Futures.immediateFailedFuture(new IllegalStateException("Tenant not found"));}); + } +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java index 6a9146de98..2fd9f4e8ee 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -58,6 +58,7 @@ public class TbJsFilterNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg, "false"); verifyNoMoreInteractions(ctx); } @@ -102,6 +103,7 @@ public class TbJsFilterNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg, "false"); verifyNoMoreInteractions(ctx); } @@ -116,7 +118,7 @@ public class TbJsFilterNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); - verify(ctx).tellNext(msg); + verify(ctx).tellNext(msg, "true"); } @Test @@ -132,7 +134,7 @@ public class TbJsFilterNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); - verify(ctx).tellNext(msg); + verify(ctx).tellNext(msg, "true"); } private void initWithScript(String script) throws TbNodeException { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index 1b4cce9fc9..a2f5f7d6f2 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -34,14 +34,13 @@ import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; +import java.util.HashSet; import java.util.Set; import java.util.concurrent.Callable; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.same; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; @RunWith(MockitoJUnitRunner.class) public class TbJsSwitchNodeTest { @@ -53,6 +52,41 @@ public class TbJsSwitchNodeTest { @Mock private ListeningExecutor executor; + @Test + public void routeToAllDoNotEvaluatesJs() throws TbNodeException { + HashSet relations = Sets.newHashSet("one", "two"); + initWithScript("test qwerty", relations, true); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}".getBytes()); + + node.onMsg(ctx, msg); + verify(ctx).tellNext(msg, relations); + verifyNoMoreInteractions(ctx, executor); + } + + @Test + public void multipleRoutesAreAllowed() throws TbNodeException { + String jsCode = "function nextRelation(meta, msg) {\n" + + " if(msg.passed == 5 && meta.temp == 10)\n" + + " return ['three', 'one']\n" + + " else\n" + + " return 'two';\n" + + "};\n" + + "\n" + + "nextRelation(meta, msg);"; + initWithScript(jsCode, Sets.newHashSet("one", "two", "three"), false); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + verify(ctx).tellNext(msg, Sets.newHashSet("one", "three")); + } + @Test public void allowedRelationPassed() throws TbNodeException { String jsCode = "function nextRelation(meta, msg) {\n" + @@ -63,7 +97,7 @@ public class TbJsSwitchNodeTest { "};\n" + "\n" + "nextRelation(meta, msg);"; - initWithScript(jsCode, Sets.newHashSet("one", "two")); + initWithScript(jsCode, Sets.newHashSet("one", "two"), false); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -74,17 +108,17 @@ public class TbJsSwitchNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); - verify(ctx).tellNext(msg, "one"); + verify(ctx).tellNext(msg, Sets.newHashSet("one")); } @Test public void unknownRelationThrowsException() throws TbNodeException { String jsCode = "function nextRelation(meta, msg) {\n" + - " return 'nine';" + + " return ['one','nine'];" + "};\n" + "\n" + "nextRelation(meta, msg);"; - initWithScript(jsCode, Sets.newHashSet("one", "two")); + initWithScript(jsCode, Sets.newHashSet("one", "two"), false); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -95,13 +129,14 @@ public class TbJsSwitchNodeTest { node.onMsg(ctx, msg); verify(ctx).getJsExecutor(); - verifyError(msg, "Unsupported relation for switch nine", IllegalStateException.class); + verifyError(msg, "Unsupported relation for switch [nine, one]", IllegalStateException.class); } - private void initWithScript(String script, Set relations) throws TbNodeException { + private void initWithScript(String script, Set relations, boolean routeToAll) throws TbNodeException { TbJsSwitchNodeConfiguration config = new TbJsSwitchNodeConfiguration(); config.setJsScript(script); config.setAllowedRelations(relations); + config.setRouteToAllWithNoCheck(routeToAll); ObjectMapper mapper = new ObjectMapper(); TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); nodeConfiguration.setData(mapper.valueToTree(config)); @@ -112,10 +147,10 @@ public class TbJsSwitchNodeTest { private void mockJsExecutor() { when(ctx.getJsExecutor()).thenReturn(executor); - doAnswer((Answer>) invocationOnMock -> { + doAnswer((Answer>>) invocationOnMock -> { try { Callable task = (Callable) (invocationOnMock.getArguments())[0]; - return Futures.immediateFuture((String) task.call()); + return Futures.immediateFuture((Set) task.call()); } catch (Throwable th) { return Futures.immediateFailedFuture(th); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java new file mode 100644 index 0000000000..77b00fb778 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java @@ -0,0 +1,125 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.Futures; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.dao.asset.AssetService; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class TbChangeOriginatorNodeTest { + + private TbChangeOriginatorNode node; + + @Mock + private TbContext ctx; + @Mock + private AssetService assetService; + + + @Test + public void originatorCanBeChangedToCustomerId() throws TbNodeException { + init(false); + AssetId assetId = new AssetId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Asset asset = new Asset(); + asset.setCustomerId(customerId); + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getAssetService()).thenReturn(assetService); + when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); + + node.onMsg(ctx, msg); + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture()); + TbMsg actualMsg = captor.getValue(); + assertEquals(customerId, actualMsg.getOriginator()); + assertEquals(msg.getId(), actualMsg.getId()); + } + + @Test + public void newChainCanBeStarted() throws TbNodeException { + init(true); + AssetId assetId = new AssetId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Asset asset = new Asset(); + asset.setCustomerId(customerId); + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getAssetService()).thenReturn(assetService); + when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); + + node.onMsg(ctx, msg); + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).spawn(captor.capture()); + TbMsg actualMsg = captor.getValue(); + assertEquals(customerId, actualMsg.getOriginator()); + assertEquals(msg.getId(), actualMsg.getId()); + } + + @Test + public void exceptionThrownIfCannotFindNewOriginator() throws TbNodeException { + init(true); + AssetId assetId = new AssetId(UUIDs.timeBased()); + CustomerId customerId = new CustomerId(UUIDs.timeBased()); + Asset asset = new Asset(); + asset.setCustomerId(customerId); + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + + when(ctx.getAssetService()).thenReturn(assetService); + when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFailedFuture(new IllegalStateException("wrong"))); + + node.onMsg(ctx, msg); + ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + Throwable value = captor.getValue(); + assertEquals("wrong", value.getMessage()); + } + + public void init(boolean startNewChain) throws TbNodeException { + TbChangeOriginatorNodeConfiguration config = new TbChangeOriginatorNodeConfiguration(); + config.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE); + config.setStartNewChain(startNewChain); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbChangeOriginatorNode(); + node.init(nodeConfiguration, null); + } +} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java new file mode 100644 index 0000000000..876e70f9b8 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -0,0 +1,141 @@ +/** + * Copyright © 2016-2018 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.rule.engine.transform; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; +import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import java.util.concurrent.Callable; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.*; + +@RunWith(MockitoJUnitRunner.class) +public class TbTransformMsgNodeTest { + + private TbTransformMsgNode node; + + @Mock + private TbContext ctx; + @Mock + private ListeningExecutor executor; + + @Test + public void metadataCanBeUpdated() throws TbNodeException { + initWithScript("meta.temp = meta.temp * 10;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture()); + TbMsg actualMsg = captor.getValue(); + assertEquals("70.0", actualMsg.getMetaData().getValue("temp")); + } + + @Test + public void metadataCanBeAdded() throws TbNodeException { + initWithScript("meta.newAttr = meta.humidity - msg.passed;"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture()); + TbMsg actualMsg = captor.getValue(); + assertEquals("94.0", actualMsg.getMetaData().getValue("newAttr")); + } + + @Test + public void payloadCanBeUpdated() throws TbNodeException { + initWithScript("msg.passed = msg.passed * meta.temp; msg.bigObj.newProp = 'Ukraine' "); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\":\"Vit\",\"passed\": 5,\"bigObj\":{\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + mockJsExecutor(); + + node.onMsg(ctx, msg); + verify(ctx).getJsExecutor(); + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture()); + TbMsg actualMsg = captor.getValue(); + String expectedJson = "{\"name\":\"Vit\",\"passed\":35.0,\"bigObj\":{\"prop\":42,\"newProp\":\"Ukraine\"}}"; + assertEquals(expectedJson, new String(actualMsg.getData())); + } + + private void initWithScript(String script) throws TbNodeException { + TbTransformMsgNodeConfiguration config = new TbTransformMsgNodeConfiguration(); + config.setJsScript(script); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); + nodeConfiguration.setData(mapper.valueToTree(config)); + + node = new TbTransformMsgNode(); + node.init(nodeConfiguration, null); + } + + private void mockJsExecutor() { + when(ctx.getJsExecutor()).thenReturn(executor); + doAnswer((Answer>) invocationOnMock -> { + try { + Callable task = (Callable) (invocationOnMock.getArguments())[0]; + return Futures.immediateFuture((TbMsg) task.call()); + } catch (Throwable th) { + return Futures.immediateFailedFuture(th); + } + }).when(executor).executeAsync(Matchers.any(Callable.class)); + } + + private void verifyError(TbMsg msg, String message, Class expectedClass) { + ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals(expectedClass, value.getClass()); + assertEquals(message, value.getMessage()); + } +} \ No newline at end of file From 64a8e5c152c6f0629d883608b87686edb9eace6a Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 20 Mar 2018 17:40:56 +0200 Subject: [PATCH 16/75] First integration test for the new rule engine. Fixed a lot of bugs --- application/pom.xml | 4 + .../main/data/upgrade/1.5.0/schema_update.cql | 2 + .../main/data/upgrade/1.5.0/schema_update.sql | 2 + .../server/actors/ActorSystemContext.java | 193 +++++++--- .../server/actors/app/AppActor.java | 13 +- .../server/actors/device/DeviceActor.java | 21 +- .../device/DeviceActorMessageProcessor.java | 63 ++-- .../server/actors/plugin/PluginActor.java | 7 + .../server/actors/rpc/RpcManagerActor.java | 7 + .../server/actors/rpc/RpcSessionActor.java | 7 + .../actors/rule/ChainProcessingContext.java | 117 ------ .../actors/rule/ChainProcessingMetaData.java | 41 --- .../actors/rule/ComplexRuleActorChain.java | 43 --- .../actors/rule/CompoundRuleActorChain.java | 20 - .../server/actors/rule/RuleActor.java | 90 ----- .../rule/RuleActorMessageProcessor.java | 345 ------------------ .../server/actors/rule/RuleActorMetaData.java | 107 ------ .../rule/RuleContextAwareMsgProcessor.java | 33 -- .../actors/rule/RuleProcessingContext.java | 115 ------ .../server/actors/rule/RuleProcessingMsg.java | 31 -- .../actors/rule/RuleTerminationMsg.java | 30 -- .../actors/rule/RuleToPluginTimeoutMsg.java | 36 -- .../actors/rule/SimpleRuleActorChain.java | 39 -- .../actors/ruleChain/DefaultTbContext.java | 90 ++++- .../actors/ruleChain/RuleChainActor.java | 15 +- .../RuleChainActorMessageProcessor.java | 33 +- .../ruleChain/RuleChainManagerActor.java | 15 + .../ruleChain/RuleChainToRuleNodeMsg.java | 15 + .../actors/ruleChain/RuleNodeActor.java | 26 +- .../RuleNodeActorMessageProcessor.java | 40 +- .../server/actors/ruleChain/RuleNodeCtx.java | 22 +- .../actors/ruleChain/RuleNodeRelation.java | 15 + .../RuleNodeToRuleChainTellNextMsg.java | 15 + .../RuleNodeToSelfErrorMsg.java} | 28 +- .../server/actors/service/ComponentActor.java | 1 - .../actors/service/ContextAwareActor.java | 9 +- .../actors/service/DefaultActorService.java | 8 +- .../server/actors/session/SessionActor.java | 7 + .../actors/session/SessionManagerActor.java | 7 + .../actors/shared/EntityActorsManager.java | 15 + .../actors/shared/plugin/PluginManager.java | 8 +- .../actors/shared/rule/RuleManager.java | 135 ------- .../actors/shared/rule/SystemRuleManager.java | 40 -- .../actors/shared/rule/TenantRuleManager.java | 48 --- .../shared/rulechain/RuleChainManager.java | 15 + .../rulechain/TenantRuleChainManager.java | 11 +- .../server/actors/stats/StatsActor.java | 7 + .../actors/tenant/RuleChainDeviceMsg.java | 40 -- .../server/actors/tenant/TenantActor.java | 13 +- .../controller/RuleChainController.java | 2 +- .../AnnotationComponentDiscoveryService.java | 49 ++- .../src/main/resources/thingsboard.yml | 14 +- .../controller/AbstractControllerTest.java | 2 + .../AbstractRuleEngineControllerTest.java | 41 +++ .../server/rules/RuleEngineSqlTestSuite.java | 35 ++ ...AbstractRuleEngineFlowIntegrationTest.java | 156 ++++++++ .../RuleEngineFlowSqlIntegrationTest.java} | 14 +- .../server/common/data/DataConstants.java | 7 +- .../common/data/plugin/ComponentType.java | 2 +- .../server/common/data/rule/RuleChain.java | 1 + .../server/common/data/rule/RuleNode.java | 1 + .../server/common/msg/MsgType.java | 20 + .../server/common/msg/TbActorMsg.java | 15 + .../thingsboard/server/common/msg/TbMsg.java | 30 +- .../server/common/msg/TbMsgDataType.java | 15 + .../server/common/msg/TbMsgMetaData.java | 19 +- .../msg/plugin/ComponentLifecycleMsg.java | 8 +- .../msg/system/ServiceToRuleEngineMsg.java | 15 + .../server/dao/model/ModelConstants.java | 2 + .../dao/model/nosql/RuleChainEntity.java | 16 +- .../dao/model/nosql/RuleNodeEntity.java | 9 + .../server/dao/model/sql/RuleChainEntity.java | 5 + .../server/dao/model/sql/RuleNodeEntity.java | 5 + .../server/dao/queue/QueueBenchmark.java | 3 +- .../server/dao/rule/BaseRuleChainService.java | 8 +- .../server/dao/rule/RuleChainService.java | 2 + dao/src/main/resources/cassandra/schema.cql | 2 + dao/src/main/resources/sql/schema.sql | 2 + .../dao/service/AbstractServiceTest.java | 6 +- .../cassandra/UnprocessedMsgFilterTest.java | 4 +- .../impl/CassandraMsgRepositoryTest.java | 7 +- pom.xml | 5 + .../rule/engine/api/ActionNode.java | 43 +++ .../rule/engine/api/EnrichmentNode.java | 42 +++ .../rule/engine/api/FilterNode.java | 43 +++ .../rule/engine/api/TbContext.java | 2 - .../rule/engine/api/TbNodeConfiguration.java | 4 +- .../rule/engine/api/TbNodeState.java | 2 +- .../rule/engine/api/TransformationNode.java | 43 +++ .../main/resources/EmptyNodeDescriptor.json | 2 + rule-engine/rule-engine-components/pom.xml | 5 - .../engine/metadata/TbGetAttributesNode.java | 26 +- .../metadata/TbGetCustomerAttributeNode.java | 2 + .../metadata/TbGetRelatedAttributeNode.java | 6 +- .../metadata/TbGetTenantAttributeNode.java | 4 +- .../TbGetCustomerAttributeNodeTest.java | 6 +- 96 files changed, 1238 insertions(+), 1558 deletions(-) delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/ChainProcessingContext.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/ChainProcessingMetaData.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/ComplexRuleActorChain.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/CompoundRuleActorChain.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleActor.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMetaData.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleContextAwareMsgProcessor.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingContext.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingMsg.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleTerminationMsg.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/RuleToPluginTimeoutMsg.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/rule/SimpleRuleActorChain.java rename application/src/main/java/org/thingsboard/server/actors/{rule/RulesProcessedMsg.java => ruleChain/RuleNodeToSelfErrorMsg.java} (54%) delete mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rule/RuleManager.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rule/SystemRuleManager.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/shared/rule/TenantRuleManager.java delete mode 100644 application/src/main/java/org/thingsboard/server/actors/tenant/RuleChainDeviceMsg.java create mode 100644 application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java create mode 100644 application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java create mode 100644 application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java rename application/src/{main/java/org/thingsboard/server/actors/rule/RuleActorChain.java => test/java/org/thingsboard/server/rules/flow/RuleEngineFlowSqlIntegrationTest.java} (64%) create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java create mode 100644 rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json diff --git a/application/pom.xml b/application/pom.xml index 95322fa3a2..6da40a9143 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -57,6 +57,10 @@ org.thingsboard.rule-engine rule-engine-api + + org.thingsboard.rule-engine + rule-engine-components + org.thingsboard extensions-core diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.cql b/application/src/main/data/upgrade/1.5.0/schema_update.cql index aa8b10bdfd..ab6884659d 100644 --- a/application/src/main/data/upgrade/1.5.0/schema_update.cql +++ b/application/src/main/data/upgrade/1.5.0/schema_update.cql @@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_chain ( search_text text, first_rule_node_id uuid, root boolean, + debug_mode boolean, configuration text, additional_info text, PRIMARY KEY (id, tenant_id) @@ -85,6 +86,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_node ( id uuid, type text, name text, + debug_mode boolean, search_text text, configuration text, additional_info text, diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.sql b/application/src/main/data/upgrade/1.5.0/schema_update.sql index 0043ed5bb0..2bed6ad9da 100644 --- a/application/src/main/data/upgrade/1.5.0/schema_update.sql +++ b/application/src/main/data/upgrade/1.5.0/schema_update.sql @@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( name varchar(255), first_rule_node_id varchar(31), root boolean, + debug_mode boolean, search_text varchar(255), tenant_id varchar(31) ); @@ -31,5 +32,6 @@ CREATE TABLE IF NOT EXISTS rule_node ( configuration varchar(10000000), type varchar(255), name varchar(255), + debug_mode boolean, search_text varchar(255) ); \ No newline at end of file diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 68d55475af..bbe7771e61 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -28,12 +28,14 @@ import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.util.Base64Utils; import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; 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.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.transport.auth.DeviceAuthService; import org.thingsboard.server.controller.plugin.PluginWebSocketMsgEndpoint; @@ -50,6 +52,7 @@ import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.timeseries.TimeseriesService; +import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.service.cluster.discovery.DiscoveryService; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; @@ -57,6 +60,7 @@ import org.thingsboard.server.service.component.ComponentDiscoveryService; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.charset.StandardCharsets; import java.util.Optional; @Component @@ -65,107 +69,154 @@ public class ActorSystemContext { protected final ObjectMapper mapper = new ObjectMapper(); - @Getter @Setter private ActorService actorService; + @Getter + @Setter + private ActorService actorService; @Autowired - @Getter private DiscoveryService discoveryService; + @Getter + private DiscoveryService discoveryService; @Autowired - @Getter @Setter private ComponentDiscoveryService componentService; + @Getter + @Setter + private ComponentDiscoveryService componentService; @Autowired - @Getter private ClusterRoutingService routingService; + @Getter + private ClusterRoutingService routingService; @Autowired - @Getter private ClusterRpcService rpcService; + @Getter + private ClusterRpcService rpcService; @Autowired - @Getter private DeviceAuthService deviceAuthService; + @Getter + private DeviceAuthService deviceAuthService; @Autowired - @Getter private DeviceService deviceService; + @Getter + private DeviceService deviceService; @Autowired - @Getter private AssetService assetService; + @Getter + private AssetService assetService; @Autowired - @Getter private TenantService tenantService; + @Getter + private TenantService tenantService; @Autowired - @Getter private CustomerService customerService; + @Getter + private CustomerService customerService; @Autowired - @Getter private RuleService ruleService; + @Getter + private UserService userService; @Autowired - @Getter private RuleChainService ruleChainService; + @Getter + private RuleService ruleService; @Autowired - @Getter private PluginService pluginService; + @Getter + private RuleChainService ruleChainService; @Autowired - @Getter private TimeseriesService tsService; + @Getter + private PluginService pluginService; @Autowired - @Getter private AttributesService attributesService; + @Getter + private TimeseriesService tsService; @Autowired - @Getter private EventService eventService; + @Getter + private AttributesService attributesService; @Autowired - @Getter private AlarmService alarmService; + @Getter + private EventService eventService; @Autowired - @Getter private RelationService relationService; + @Getter + private AlarmService alarmService; @Autowired - @Getter private AuditLogService auditLogService; + @Getter + private RelationService relationService; @Autowired - @Getter @Setter private PluginWebSocketMsgEndpoint wsMsgEndpoint; + @Getter + private AuditLogService auditLogService; + + @Autowired + @Getter + @Setter + private PluginWebSocketMsgEndpoint wsMsgEndpoint; @Value("${actors.session.sync.timeout}") - @Getter private long syncSessionTimeout; + @Getter + private long syncSessionTimeout; @Value("${actors.plugin.termination.delay}") - @Getter private long pluginActorTerminationDelay; + @Getter + private long pluginActorTerminationDelay; @Value("${actors.plugin.processing.timeout}") - @Getter private long pluginProcessingTimeout; + @Getter + private long pluginProcessingTimeout; @Value("${actors.plugin.error_persist_frequency}") - @Getter private long pluginErrorPersistFrequency; + @Getter + private long pluginErrorPersistFrequency; @Value("${actors.rule.chain.error_persist_frequency}") - @Getter private long ruleChainErrorPersistFrequency; + @Getter + private long ruleChainErrorPersistFrequency; @Value("${actors.rule.node.error_persist_frequency}") - @Getter private long ruleNodeErrorPersistFrequency; + @Getter + private long ruleNodeErrorPersistFrequency; @Value("${actors.rule.termination.delay}") - @Getter private long ruleActorTerminationDelay; + @Getter + private long ruleActorTerminationDelay; @Value("${actors.rule.error_persist_frequency}") - @Getter private long ruleErrorPersistFrequency; + @Getter + private long ruleErrorPersistFrequency; @Value("${actors.statistics.enabled}") - @Getter private boolean statisticsEnabled; + @Getter + private boolean statisticsEnabled; @Value("${actors.statistics.persist_frequency}") - @Getter private long statisticsPersistFrequency; + @Getter + private long statisticsPersistFrequency; @Value("${actors.tenant.create_components_on_init}") - @Getter private boolean tenantComponentsInitEnabled; + @Getter + private boolean tenantComponentsInitEnabled; - @Getter @Setter private ActorSystem actorSystem; + @Getter + @Setter + private ActorSystem actorSystem; - @Getter @Setter private ActorRef appActor; + @Getter + @Setter + private ActorRef appActor; - @Getter @Setter private ActorRef sessionManagerActor; + @Getter + @Setter + private ActorRef sessionManagerActor; - @Getter @Setter private ActorRef statsActor; + @Getter + @Setter + private ActorRef statsActor; - @Getter private final Config config; + @Getter + private final Config config; public ActorSystemContext() { config = ConfigFactory.parseResources(AKKA_CONF_FILE_NAME).withFallback(ConfigFactory.load()); @@ -197,7 +248,7 @@ public class ActorSystemContext { eventService.save(event); } - private String toString(Exception e) { + private String toString(Throwable e) { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw)); return sw.toString(); @@ -217,4 +268,64 @@ public class ActorSystemContext { private JsonNode toBodyJson(ServerAddress server, String method, String body) { return mapper.createObjectNode().put("server", server.toString()).put("method", method).put("error", body); } + + public String getServerAddress() { + return discoveryService.getCurrentServer().getServerAddress().toString(); + } + + public void persistDebugInput(TenantId tenantId, EntityId entityId, TbMsg tbMsg) { + persistDebug(tenantId, entityId, "IN", tbMsg, null); + } + + public void persistDebugInput(TenantId tenantId, EntityId entityId, TbMsg tbMsg, Throwable error) { + persistDebug(tenantId, entityId, "IN", tbMsg, error); + } + + public void persistDebugOutput(TenantId tenantId, EntityId entityId, TbMsg tbMsg, Throwable error) { + persistDebug(tenantId, entityId, "OUT", tbMsg, error); + } + + public void persistDebugOutput(TenantId tenantId, EntityId entityId, TbMsg tbMsg) { + persistDebug(tenantId, entityId, "OUT", tbMsg, null); + } + + private void persistDebug(TenantId tenantId, EntityId entityId, String type, TbMsg tbMsg, Throwable error) { + Event event = new Event(); + event.setTenantId(tenantId); + event.setEntityId(entityId); + event.setType(DataConstants.DEBUG); + + ObjectNode node = mapper.createObjectNode() + .put("type", type) + .put("server", getServerAddress()) + .put("entityId", tbMsg.getOriginator().getId().toString()) + .put("entityName", tbMsg.getOriginator().getEntityType().name()) + .put("msgId", tbMsg.getId().toString()) + .put("msgType", tbMsg.getType()) + .put("dataType", tbMsg.getDataType().name()); + + ObjectNode mdNode = node.putObject("metadata"); + tbMsg.getMetaData().getData().forEach(mdNode::put); + + switch (tbMsg.getDataType()) { + case BINARY: + node.put("data", Base64Utils.encodeUrlSafe(tbMsg.getData())); + break; + default: + node.put("data", new String(tbMsg.getData(), StandardCharsets.UTF_8)); + break; + } + + if (error != null) { + node = node.put("error", toString(error)); + } + + event.setBody(node); + eventService.save(event); + } + + public static Exception toException(Throwable error) { + return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); + } + } diff --git a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java index 5e05a60a14..a75158f2dd 100644 --- a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -88,7 +88,7 @@ public class AppActor extends RuleChainManagerActor { } @Override - protected void process(TbActorMsg msg) { + protected boolean process(TbActorMsg msg) { switch (msg.getMsgType()) { case COMPONENT_LIFE_CYCLE_MSG: onComponentLifecycleMsg((ComponentLifecycleMsg) msg); @@ -96,7 +96,10 @@ public class AppActor extends RuleChainManagerActor { case SERVICE_TO_RULE_ENGINE_MSG: onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); break; + default: + return false; } + return true; } private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java index 861c405e08..87bc9926d4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java @@ -18,19 +18,19 @@ package org.thingsboard.server.actors.device; import akka.event.Logging; import akka.event.LoggingAdapter; import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.rule.RulesProcessedMsg; import org.thingsboard.server.actors.service.ContextAwareActor; import org.thingsboard.server.actors.service.ContextBasedCreator; -import org.thingsboard.server.actors.tenant.RuleChainDeviceMsg; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.device.DeviceCredentialsUpdateNotificationMsg; import org.thingsboard.server.extensions.api.device.DeviceNameOrTypeUpdateMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; -import org.thingsboard.server.extensions.api.plugins.msg.*; +import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; +import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; public class DeviceActor extends ContextAwareActor { @@ -47,13 +47,18 @@ public class DeviceActor extends ContextAwareActor { this.processor = new DeviceActorMessageProcessor(systemContext, logger, deviceId); } + @Override + protected boolean process(TbActorMsg msg) { + return false; + } + @Override public void onReceive(Object msg) throws Exception { - if (msg instanceof RuleChainDeviceMsg) { - processor.process(context(), (RuleChainDeviceMsg) msg); - } else if (msg instanceof RulesProcessedMsg) { - processor.onRulesProcessedMsg(context(), (RulesProcessedMsg) msg); - } else if (msg instanceof ToDeviceActorMsg) { +// if (msg instanceof RuleChainDeviceMsg) { +// processor.process(context(), (RuleChainDeviceMsg) msg); +// } else if (msg instanceof RulesProcessedMsg) { +// processor.onRulesProcessedMsg(context(), (RulesProcessedMsg) msg); + if (msg instanceof ToDeviceActorMsg) { processor.process(context(), (ToDeviceActorMsg) msg); } else if (msg instanceof ToDeviceActorNotificationMsg) { if (msg instanceof DeviceAttributesEventNotificationMsg) { diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index 21112bf4df..3644a491a4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -19,9 +19,7 @@ import akka.actor.ActorContext; import akka.actor.ActorRef; import akka.event.LoggingAdapter; import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.rule.*; import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor; -import org.thingsboard.server.actors.tenant.RuleChainDeviceMsg; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.DeviceId; @@ -37,15 +35,10 @@ import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.MsgType; import org.thingsboard.server.common.msg.session.SessionType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; -import org.thingsboard.server.extensions.api.device.*; -import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; -import org.thingsboard.server.extensions.api.plugins.msg.RpcError; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutIntMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestBody; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; +import org.thingsboard.server.extensions.api.device.DeviceAttributes; +import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; +import org.thingsboard.server.extensions.api.device.DeviceNameOrTypeUpdateMsg; +import org.thingsboard.server.extensions.api.plugins.msg.*; import java.util.*; import java.util.concurrent.ExecutionException; @@ -230,18 +223,18 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } - void process(ActorContext context, RuleChainDeviceMsg srcMsg) { - ChainProcessingMetaData md = new ChainProcessingMetaData(srcMsg.getRuleChain(), - srcMsg.getToDeviceActorMsg(), new DeviceMetaData(deviceId, deviceName, deviceType, deviceAttributes), context.self()); - ChainProcessingContext ctx = new ChainProcessingContext(md); - if (ctx.getChainLength() > 0) { - RuleProcessingMsg msg = new RuleProcessingMsg(ctx); - ActorRef ruleActorRef = ctx.getCurrentActor(); - ruleActorRef.tell(msg, ActorRef.noSender()); - } else { - context.self().tell(new RulesProcessedMsg(ctx), context.self()); - } - } +// void process(ActorContext context, RuleChainDeviceMsg srcMsg) { +// ChainProcessingMetaData md = new ChainProcessingMetaData(srcMsg.getRuleChain(), +// srcMsg.getToDeviceActorMsg(), new DeviceMetaData(deviceId, deviceName, deviceType, deviceAttributes), context.self()); +// ChainProcessingContext ctx = new ChainProcessingContext(md); +// if (ctx.getChainLength() > 0) { +// RuleProcessingMsg msg = new RuleProcessingMsg(ctx); +// ActorRef ruleActorRef = ctx.getCurrentActor(); +// ruleActorRef.tell(msg, ActorRef.noSender()); +// } else { +// context.self().tell(new RulesProcessedMsg(ctx), context.self()); +// } +// } void processRpcResponses(ActorContext context, ToDeviceActorMsg msg) { SessionId sessionId = msg.getSessionId(); @@ -302,18 +295,18 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso ); } - void onRulesProcessedMsg(ActorContext context, RulesProcessedMsg msg) { - ChainProcessingContext ctx = msg.getCtx(); - ToDeviceActorMsg inMsg = ctx.getInMsg(); - SessionId sid = inMsg.getSessionId(); - ToDeviceSessionActorMsg response; - if (ctx.getResponse() != null) { - response = new BasicToDeviceSessionActorMsg(ctx.getResponse(), sid); - } else { - response = new BasicToDeviceSessionActorMsg(ctx.getError(), sid); - } - sendMsgToSessionActor(response, inMsg.getServerAddress()); - } +// void onRulesProcessedMsg(ActorContext context, RulesProcessedMsg msg) { +// ChainProcessingContext ctx = msg.getCtx(); +// ToDeviceActorMsg inMsg = ctx.getInMsg(); +// SessionId sid = inMsg.getSessionId(); +// ToDeviceSessionActorMsg response; +// if (ctx.getResponse() != null) { +// response = new BasicToDeviceSessionActorMsg(ctx.getResponse(), sid); +// } else { +// response = new BasicToDeviceSessionActorMsg(ctx.getError(), sid); +// } +// sendMsgToSessionActor(response, inMsg.getServerAddress()); +// } private void processSubscriptionCommands(ActorContext context, ToDeviceActorMsg msg) { SessionId sessionId = msg.getSessionId(); diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java index 265da386ff..88278f316d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java @@ -23,6 +23,7 @@ import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.actors.stats.StatsPersistTick; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; @@ -40,6 +41,12 @@ public class PluginActor extends ComponentActor= this.md.chain.size()) { - throw new IllegalArgumentException("Can't apply offset " + indexOffset + " to the chain!"); - } - } - - public ActorRef getDeviceActor() { - return md.originator; - } - - public ActorRef getCurrentActor() { - return md.chain.getRuleActorMd(index).getActorRef(); - } - - public boolean hasNext() { - return (getChainLength() - 1) > index; - } - - public boolean isFailure() { - return (error != null && error.isCritical()) || (response != null && !response.isSuccess()); - } - - public ChainProcessingContext getNext() { - return new ChainProcessingContext(this, 1, this.error); - } - - public ChainProcessingContext withError(RuleEngineError error) { - if (error != null && (this.error == null || this.error.getPriority() < error.getPriority())) { - return new ChainProcessingContext(this, 0, error); - } else { - return this; - } - } - - public int getChainLength() { - return md.chain.size(); - } - - public ToDeviceActorMsg getInMsg() { - return md.inMsg; - } - - public DeviceMetaData getDeviceMetaData() { - return md.deviceMetaData; - } - - public String getDeviceName() { - return md.deviceMetaData.getDeviceName(); - } - - public String getDeviceType() { - return md.deviceMetaData.getDeviceType(); - } - - public DeviceAttributes getAttributes() { - return md.deviceMetaData.getDeviceAttributes(); - } - - public ToDeviceMsg getResponse() { - return response; - } - - public void mergeResponse(ToDeviceMsg response) { - // TODO add merge logic - this.response = response; - } - - public RuleEngineErrorMsg getError() { - return new RuleEngineErrorMsg(md.inMsg.getPayload().getMsgType(), error); - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/ChainProcessingMetaData.java b/application/src/main/java/org/thingsboard/server/actors/rule/ChainProcessingMetaData.java deleted file mode 100644 index 8080d4ecc9..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/ChainProcessingMetaData.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import akka.actor.ActorRef; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.extensions.api.device.DeviceMetaData; - -/** - * Immutable part of chain processing data; - * - * @author ashvayka - */ -public final class ChainProcessingMetaData { - - final RuleActorChain chain; - final ToDeviceActorMsg inMsg; - final ActorRef originator; - final DeviceMetaData deviceMetaData; - - public ChainProcessingMetaData(RuleActorChain chain, ToDeviceActorMsg inMsg, DeviceMetaData deviceMetaData, ActorRef originator) { - super(); - this.chain = chain; - this.inMsg = inMsg; - this.originator = originator; - this.deviceMetaData = deviceMetaData; - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/ComplexRuleActorChain.java b/application/src/main/java/org/thingsboard/server/actors/rule/ComplexRuleActorChain.java deleted file mode 100644 index 89d31bdc84..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/ComplexRuleActorChain.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -public class ComplexRuleActorChain implements RuleActorChain { - - private final RuleActorChain systemChain; - private final RuleActorChain tenantChain; - - public ComplexRuleActorChain(RuleActorChain systemChain, RuleActorChain tenantChain) { - super(); - this.systemChain = systemChain; - this.tenantChain = tenantChain; - } - - @Override - public int size() { - return systemChain.size() + tenantChain.size(); - } - - @Override - public RuleActorMetaData getRuleActorMd(int index) { - if (index < systemChain.size()) { - return systemChain.getRuleActorMd(index); - } else { - return tenantChain.getRuleActorMd(index - systemChain.size()); - } - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/CompoundRuleActorChain.java b/application/src/main/java/org/thingsboard/server/actors/rule/CompoundRuleActorChain.java deleted file mode 100644 index b2eb53fe3f..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/CompoundRuleActorChain.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -public class CompoundRuleActorChain { - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActor.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActor.java deleted file mode 100644 index 062da2a3bb..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActor.java +++ /dev/null @@ -1,90 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.service.ComponentActor; -import org.thingsboard.server.actors.service.ContextBasedCreator; -import org.thingsboard.server.actors.stats.StatsPersistTick; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; -import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg; - -public class RuleActor extends ComponentActor { - - private RuleActor(ActorSystemContext systemContext, TenantId tenantId, RuleId ruleId) { - super(systemContext, tenantId, ruleId); - setProcessor(new RuleActorMessageProcessor(tenantId, ruleId, systemContext, logger)); - } - - @Override - public void onReceive(Object msg) throws Exception { - logger.debug("[{}] Received message: {}", id, msg); - if (msg instanceof RuleProcessingMsg) { - try { - processor.onRuleProcessingMsg(context(), (RuleProcessingMsg) msg); - increaseMessagesProcessedCount(); - } catch (Exception e) { - logAndPersist("onDeviceMsg", e); - } - } else if (msg instanceof PluginToRuleMsg) { - try { - processor.onPluginMsg(context(), (PluginToRuleMsg) msg); - } catch (Exception e) { - logAndPersist("onPluginMsg", e); - } - } else if (msg instanceof ComponentLifecycleMsg) { - onComponentLifecycleMsg((ComponentLifecycleMsg) msg); - } else if (msg instanceof ClusterEventMsg) { - onClusterEventMsg((ClusterEventMsg) msg); - } else if (msg instanceof RuleToPluginTimeoutMsg) { - try { - processor.onTimeoutMsg(context(), (RuleToPluginTimeoutMsg) msg); - } catch (Exception e) { - logAndPersist("onTimeoutMsg", e); - } - } else if (msg instanceof StatsPersistTick) { - onStatsPersistTick(id); - } else { - logger.debug("[{}][{}] Unknown msg type.", tenantId, id, msg.getClass().getName()); - } - } - - public static class ActorCreator extends ContextBasedCreator { - private static final long serialVersionUID = 1L; - - private final TenantId tenantId; - private final RuleId ruleId; - - public ActorCreator(ActorSystemContext context, TenantId tenantId, RuleId ruleId) { - super(context); - this.tenantId = tenantId; - this.ruleId = ruleId; - } - - @Override - public RuleActor create() throws Exception { - return new RuleActor(context, tenantId, ruleId); - } - } - - @Override - protected long getErrorPersistFrequency() { - return systemContext.getRuleErrorPersistFrequency(); - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java deleted file mode 100644 index 236fca7e0f..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java +++ /dev/null @@ -1,345 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import java.util.*; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.springframework.util.StringUtils; -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.plugin.RuleToPluginMsgWrapper; -import org.thingsboard.server.actors.shared.ComponentMsgProcessor; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.core.BasicRequest; -import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; -import org.thingsboard.server.common.msg.core.RuleEngineError; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.common.msg.session.MsgType; -import org.thingsboard.server.common.msg.session.ToDeviceMsg; -import org.thingsboard.server.common.msg.session.ex.ProcessingTimeoutException; -import org.thingsboard.server.extensions.api.rules.*; -import org.thingsboard.server.extensions.api.plugins.PluginAction; -import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg; -import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; - -import com.fasterxml.jackson.databind.JsonNode; - -import akka.actor.ActorContext; -import akka.actor.ActorRef; -import akka.event.LoggingAdapter; - -class RuleActorMessageProcessor extends ComponentMsgProcessor { - - private final RuleProcessingContext ruleCtx; - private final Map pendingMsgMap; - - private RuleMetaData ruleMd; - private ComponentLifecycleState state; - private List filters; - private RuleProcessor processor; - private PluginAction action; - - private TenantId pluginTenantId; - private PluginId pluginId; - - protected RuleActorMessageProcessor(TenantId tenantId, RuleId ruleId, ActorSystemContext systemContext, LoggingAdapter logger) { - super(systemContext, logger, tenantId, ruleId); - this.pendingMsgMap = new HashMap<>(); - this.ruleCtx = new RuleProcessingContext(systemContext, ruleId); - } - - @Override - public void start(ActorContext context) throws Exception { - logger.info("[{}][{}] Starting rule actor.", entityId, tenantId); - ruleMd = systemContext.getRuleService().findRuleById(entityId); - if (ruleMd == null) { - throw new RuleInitializationException("Rule not found!"); - } - state = ruleMd.getState(); - if (state == ComponentLifecycleState.ACTIVE) { - logger.info("[{}] Rule is active. Going to initialize rule components.", entityId); - initComponent(); - } else { - logger.info("[{}] Rule is suspended. Skipping rule components initialization.", entityId); - } - - logger.info("[{}][{}] Started rule actor.", entityId, tenantId); - } - - @Override - public void stop(ActorContext context) throws Exception { - onStop(); - } - - - private void initComponent() throws RuleException { - try { - if (!ruleMd.getFilters().isArray()) { - throw new RuntimeException("Filters are not array!"); - } - fetchPluginInfo(); - initFilters(); - initProcessor(); - initAction(); - } catch (RuntimeException e) { - throw new RuleInitializationException("Unknown runtime exception!", e); - } catch (InstantiationException e) { - throw new RuleInitializationException("No default constructor for rule implementation!", e); - } catch (IllegalAccessException e) { - throw new RuleInitializationException("Illegal Access Exception during rule initialization!", e); - } catch (ClassNotFoundException e) { - throw new RuleInitializationException("Rule Class not found!", e); - } catch (Exception e) { - throw new RuleException(e.getMessage(), e); - } - } - - private void initAction() throws Exception { - if (ruleMd.getAction() != null && !ruleMd.getAction().isNull()) { - action = initComponent(ruleMd.getAction()); - } - } - - private void initProcessor() throws Exception { - if (ruleMd.getProcessor() != null && !ruleMd.getProcessor().isNull()) { - processor = initComponent(ruleMd.getProcessor()); - } - } - - private void initFilters() throws Exception { - filters = new ArrayList<>(ruleMd.getFilters().size()); - for (int i = 0; i < ruleMd.getFilters().size(); i++) { - filters.add(initComponent(ruleMd.getFilters().get(i))); - } - } - - private void fetchPluginInfo() { - if (!StringUtils.isEmpty(ruleMd.getPluginToken())) { - PluginMetaData pluginMd = systemContext.getPluginService().findPluginByApiToken(ruleMd.getPluginToken()); - pluginTenantId = pluginMd.getTenantId(); - pluginId = pluginMd.getId(); - } - } - - protected void onRuleProcessingMsg(ActorContext context, RuleProcessingMsg msg) throws RuleException { - if (state != ComponentLifecycleState.ACTIVE) { - pushToNextRule(context, msg.getCtx(), RuleEngineError.NO_ACTIVE_RULES); - return; - } - ChainProcessingContext chainCtx = msg.getCtx(); - ToDeviceActorMsg inMsg = chainCtx.getInMsg(); - - ruleCtx.update(inMsg, chainCtx.getDeviceMetaData()); - - logger.debug("[{}] Going to filter in msg: {}", entityId, inMsg); - for (RuleFilter filter : filters) { - if (!filter.filter(ruleCtx, inMsg)) { - logger.debug("[{}] In msg is NOT valid for processing by current rule: {}", entityId, inMsg); - pushToNextRule(context, msg.getCtx(), RuleEngineError.NO_FILTERS_MATCHED); - return; - } - } - RuleProcessingMetaData inMsgMd; - if (processor != null) { - logger.debug("[{}] Going to process in msg: {}", entityId, inMsg); - inMsgMd = processor.process(ruleCtx, inMsg); - } else { - inMsgMd = new RuleProcessingMetaData(); - } - logger.debug("[{}] Going to convert in msg: {}", entityId, inMsg); - if (action != null) { - Optional> ruleToPluginMsgOptional = action.convert(ruleCtx, inMsg, inMsgMd); - if (ruleToPluginMsgOptional.isPresent()) { - RuleToPluginMsg ruleToPluginMsg = ruleToPluginMsgOptional.get(); - logger.debug("[{}] Device msg is converted to: {}", entityId, ruleToPluginMsg); - context.parent().tell(new RuleToPluginMsgWrapper(pluginTenantId, pluginId, tenantId, entityId, ruleToPluginMsg), context.self()); - if (action.isOneWayAction()) { - pushToNextRule(context, msg.getCtx(), RuleEngineError.NO_TWO_WAY_ACTIONS); - return; - } else { - pendingMsgMap.put(ruleToPluginMsg.getUid(), msg); - scheduleMsgWithDelay(context, new RuleToPluginTimeoutMsg(ruleToPluginMsg.getUid()), systemContext.getPluginProcessingTimeout()); - return; - } - } - } - logger.debug("[{}] Nothing to send to plugin: {}", entityId, pluginId); - pushToNextRule(context, msg.getCtx(), RuleEngineError.NO_TWO_WAY_ACTIONS); - } - - void onPluginMsg(ActorContext context, PluginToRuleMsg msg) { - RuleProcessingMsg pendingMsg = pendingMsgMap.remove(msg.getUid()); - if (pendingMsg != null) { - ChainProcessingContext ctx = pendingMsg.getCtx(); - Optional ruleResponseOptional = action.convert(msg); - if (ruleResponseOptional.isPresent()) { - ctx.mergeResponse(ruleResponseOptional.get()); - pushToNextRule(context, ctx, null); - } else { - pushToNextRule(context, ctx, RuleEngineError.NO_RESPONSE_FROM_ACTIONS); - } - } else { - logger.warning("[{}] Processing timeout detected: [{}]", entityId, msg.getUid()); - } - } - - void onTimeoutMsg(ActorContext context, RuleToPluginTimeoutMsg msg) { - RuleProcessingMsg pendingMsg = pendingMsgMap.remove(msg.getMsgId()); - if (pendingMsg != null) { - logger.debug("[{}] Processing timeout detected [{}]: {}", entityId, msg.getMsgId(), pendingMsg); - ChainProcessingContext ctx = pendingMsg.getCtx(); - pushToNextRule(context, ctx, RuleEngineError.PLUGIN_TIMEOUT); - } - } - - private void pushToNextRule(ActorContext context, ChainProcessingContext ctx, RuleEngineError error) { - if (error != null) { - ctx = ctx.withError(error); - } - if (ctx.isFailure()) { - logger.debug("[{}][{}] Forwarding processing chain to device actor due to failure.", ruleMd.getId(), ctx.getInMsg().getDeviceId()); - ctx.getDeviceActor().tell(new RulesProcessedMsg(ctx), ActorRef.noSender()); - } else if (!ctx.hasNext()) { - logger.debug("[{}][{}] Forwarding processing chain to device actor due to end of chain.", ruleMd.getId(), ctx.getInMsg().getDeviceId()); - ctx.getDeviceActor().tell(new RulesProcessedMsg(ctx), ActorRef.noSender()); - } else { - logger.debug("[{}][{}] Forwarding processing chain to next rule actor.", ruleMd.getId(), ctx.getInMsg().getDeviceId()); - ChainProcessingContext nextTask = ctx.getNext(); - nextTask.getCurrentActor().tell(new RuleProcessingMsg(nextTask), context.self()); - } - } - - @Override - public void onCreated(ActorContext context) { - logger.info("[{}] Going to process onCreated rule.", entityId); - } - - @Override - public void onUpdate(ActorContext context) throws RuleException { - RuleMetaData oldRuleMd = ruleMd; - ruleMd = systemContext.getRuleService().findRuleById(entityId); - logger.info("[{}] Rule configuration was updated from {} to {}.", entityId, oldRuleMd, ruleMd); - try { - fetchPluginInfo(); - if (filters == null || !Objects.equals(oldRuleMd.getFilters(), ruleMd.getFilters())) { - logger.info("[{}] Rule filters require restart due to json change from {} to {}.", - entityId, mapper.writeValueAsString(oldRuleMd.getFilters()), mapper.writeValueAsString(ruleMd.getFilters())); - stopFilters(); - initFilters(); - } - if (processor == null || !Objects.equals(oldRuleMd.getProcessor(), ruleMd.getProcessor())) { - logger.info("[{}] Rule processor require restart due to configuration change.", entityId); - stopProcessor(); - initProcessor(); - } - if (action == null || !Objects.equals(oldRuleMd.getAction(), ruleMd.getAction())) { - logger.info("[{}] Rule action require restart due to configuration change.", entityId); - stopAction(); - initAction(); - } - } catch (RuntimeException e) { - throw new RuleInitializationException("Unknown runtime exception!", e); - } catch (InstantiationException e) { - throw new RuleInitializationException("No default constructor for rule implementation!", e); - } catch (IllegalAccessException e) { - throw new RuleInitializationException("Illegal Access Exception during rule initialization!", e); - } catch (ClassNotFoundException e) { - throw new RuleInitializationException("Rule Class not found!", e); - } catch (JsonProcessingException e) { - throw new RuleInitializationException("Rule configuration is invalid!", e); - } catch (Exception e) { - throw new RuleInitializationException(e.getMessage(), e); - } - } - - @Override - public void onActivate(ActorContext context) throws Exception { - logger.info("[{}] Going to process onActivate rule.", entityId); - this.state = ComponentLifecycleState.ACTIVE; - if (filters != null) { - filters.forEach(RuleLifecycleComponent::resume); - if (processor != null) { - processor.resume(); - } else { - initProcessor(); - } - if (action != null) { - action.resume(); - } - logger.info("[{}] Rule resumed.", entityId); - } else { - start(); - } - } - - @Override - public void onSuspend(ActorContext context) { - logger.info("[{}] Going to process onSuspend rule.", entityId); - this.state = ComponentLifecycleState.SUSPENDED; - if (filters != null) { - filters.forEach(f -> f.suspend()); - } - if (processor != null) { - processor.suspend(); - } - if (action != null) { - action.suspend(); - } - } - - @Override - public void onStop(ActorContext context) { - logger.info("[{}] Going to process onStop rule.", entityId); - onStop(); - scheduleMsgWithDelay(context, new RuleTerminationMsg(entityId), systemContext.getRuleActorTerminationDelay()); - } - - private void onStop() { - this.state = ComponentLifecycleState.SUSPENDED; - stopFilters(); - stopProcessor(); - stopAction(); - } - - @Override - public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { - //Do nothing - } - - private void stopAction() { - if (action != null) { - action.stop(); - } - } - - private void stopProcessor() { - if (processor != null) { - processor.stop(); - } - } - - private void stopFilters() { - if (filters != null) { - filters.forEach(f -> f.stop()); - } - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMetaData.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMetaData.java deleted file mode 100644 index df7adac396..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMetaData.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import java.util.Comparator; - -import org.thingsboard.server.common.data.id.RuleId; - -import akka.actor.ActorRef; - -public class RuleActorMetaData { - - private final RuleId ruleId; - private final boolean systemRule; - private final int weight; - private final ActorRef actorRef; - - public static final Comparator RULE_ACTOR_MD_COMPARATOR = new Comparator() { - - @Override - public int compare(RuleActorMetaData r1, RuleActorMetaData r2) { - if (r1.isSystemRule() && !r2.isSystemRule()) { - return 1; - } else if (!r1.isSystemRule() && r2.isSystemRule()) { - return -1; - } else { - return Integer.compare(r2.getWeight(), r1.getWeight()); - } - } - }; - - public static RuleActorMetaData systemRule(RuleId ruleId, int weight, ActorRef actorRef) { - return new RuleActorMetaData(ruleId, true, weight, actorRef); - } - - public static RuleActorMetaData tenantRule(RuleId ruleId, int weight, ActorRef actorRef) { - return new RuleActorMetaData(ruleId, false, weight, actorRef); - } - - private RuleActorMetaData(RuleId ruleId, boolean systemRule, int weight, ActorRef actorRef) { - super(); - this.ruleId = ruleId; - this.systemRule = systemRule; - this.weight = weight; - this.actorRef = actorRef; - } - - public RuleId getRuleId() { - return ruleId; - } - - public boolean isSystemRule() { - return systemRule; - } - - public int getWeight() { - return weight; - } - - public ActorRef getActorRef() { - return actorRef; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ruleId == null) ? 0 : ruleId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RuleActorMetaData other = (RuleActorMetaData) obj; - if (ruleId == null) { - if (other.ruleId != null) - return false; - } else if (!ruleId.equals(other.ruleId)) - return false; - return true; - } - - @Override - public String toString() { - return "RuleActorMetaData [ruleId=" + ruleId + ", systemRule=" + systemRule + ", weight=" + weight + ", actorRef=" + actorRef + "]"; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleContextAwareMsgProcessor.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleContextAwareMsgProcessor.java deleted file mode 100644 index c0d0705c4d..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleContextAwareMsgProcessor.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor; -import org.thingsboard.server.common.data.id.RuleId; - -import akka.event.LoggingAdapter; - -public class RuleContextAwareMsgProcessor extends AbstractContextAwareMsgProcessor { - - private final RuleId ruleId; - - protected RuleContextAwareMsgProcessor(ActorSystemContext systemContext, LoggingAdapter logger, RuleId ruleId) { - super(systemContext, logger); - this.ruleId = ruleId; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingContext.java deleted file mode 100644 index 179307bb05..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingContext.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import com.google.common.util.concurrent.ListenableFuture; -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.common.data.Event; -import org.thingsboard.server.common.data.alarm.Alarm; -import org.thingsboard.server.common.data.alarm.AlarmId; -import org.thingsboard.server.common.data.id.*; -import org.thingsboard.server.dao.alarm.AlarmService; -import org.thingsboard.server.dao.event.EventService; -import org.thingsboard.server.dao.timeseries.TimeseriesService; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.extensions.api.device.DeviceMetaData; -import org.thingsboard.server.extensions.api.rules.RuleContext; - -import java.util.Optional; -import java.util.concurrent.ExecutionException; - -public class RuleProcessingContext implements RuleContext { - - private final TimeseriesService tsService; - private final EventService eventService; - private final AlarmService alarmService; - private final RuleId ruleId; - private TenantId tenantId; - private CustomerId customerId; - private DeviceId deviceId; - private DeviceMetaData deviceMetaData; - - RuleProcessingContext(ActorSystemContext systemContext, RuleId ruleId) { - this.tsService = systemContext.getTsService(); - this.eventService = systemContext.getEventService(); - this.alarmService = systemContext.getAlarmService(); - this.ruleId = ruleId; - } - - void update(ToDeviceActorMsg toDeviceActorMsg, DeviceMetaData deviceMetaData) { - this.tenantId = toDeviceActorMsg.getTenantId(); - this.customerId = toDeviceActorMsg.getCustomerId(); - this.deviceId = toDeviceActorMsg.getDeviceId(); - this.deviceMetaData = deviceMetaData; - } - - @Override - public RuleId getRuleId() { - return ruleId; - } - - @Override - public DeviceMetaData getDeviceMetaData() { - return deviceMetaData; - } - - @Override - public Event save(Event event) { - checkEvent(event); - return eventService.save(event); - } - - @Override - public Optional saveIfNotExists(Event event) { - checkEvent(event); - return eventService.saveIfNotExists(event); - } - - @Override - public Optional findEvent(String eventType, String eventUid) { - return eventService.findEvent(tenantId, deviceId, eventType, eventUid); - } - - @Override - public Alarm createOrUpdateAlarm(Alarm alarm) { - alarm.setTenantId(tenantId); - return alarmService.createOrUpdateAlarm(alarm); - } - - public Optional findLatestAlarm(EntityId originator, String alarmType) { - try { - return Optional.ofNullable(alarmService.findLatestByOriginatorAndType(tenantId, originator, alarmType).get()); - } catch (InterruptedException | ExecutionException e) { - throw new RuntimeException("Failed to lookup alarm!", e); - } - } - - @Override - public ListenableFuture clearAlarm(AlarmId alarmId, long clearTs) { - return alarmService.clearAlarm(alarmId, clearTs); - } - - private void checkEvent(Event event) { - if (event.getTenantId() == null) { - event.setTenantId(tenantId); - } else if (!tenantId.equals(event.getTenantId())) { - throw new IllegalArgumentException("Invalid Tenant id!"); - } - if (event.getEntityId() == null) { - event.setEntityId(deviceId); - } - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingMsg.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingMsg.java deleted file mode 100644 index 291a9a7cef..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleProcessingMsg.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -public class RuleProcessingMsg { - - private final ChainProcessingContext ctx; - - public RuleProcessingMsg(ChainProcessingContext ctx) { - super(); - this.ctx = ctx; - } - - public ChainProcessingContext getCtx() { - return ctx; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleTerminationMsg.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleTerminationMsg.java deleted file mode 100644 index 4458e5217c..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleTerminationMsg.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import org.thingsboard.server.actors.shared.ActorTerminationMsg; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleId; - -/** - * @author Andrew Shvayka - */ -public class RuleTerminationMsg extends ActorTerminationMsg { - - public RuleTerminationMsg(RuleId id) { - super(id); - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleToPluginTimeoutMsg.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleToPluginTimeoutMsg.java deleted file mode 100644 index 0258bce130..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleToPluginTimeoutMsg.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import java.io.Serializable; -import java.util.UUID; - -public class RuleToPluginTimeoutMsg implements Serializable { - - private static final long serialVersionUID = 1L; - - private final UUID msgId; - - public RuleToPluginTimeoutMsg(UUID msgId) { - super(); - this.msgId = msgId; - } - - public UUID getMsgId() { - return msgId; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/SimpleRuleActorChain.java b/application/src/main/java/org/thingsboard/server/actors/rule/SimpleRuleActorChain.java deleted file mode 100644 index 70a26e4430..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/rule/SimpleRuleActorChain.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.rule; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -public class SimpleRuleActorChain implements RuleActorChain { - - private final List rules; - - public SimpleRuleActorChain(Set ruleSet) { - rules = new ArrayList<>(ruleSet); - rules.sort(RuleActorMetaData.RULE_ACTOR_MD_COMPARATOR); - } - - public int size() { - return rules.size(); - } - - public RuleActorMetaData getRuleActorMd(int index) { - return rules.get(index); - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 0cd7601653..a1344aa8d4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -1,10 +1,34 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.dao.alarm.AlarmService; +import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.customer.CustomerService; +import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.plugin.PluginService; +import org.thingsboard.server.dao.relation.RelationService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; +import org.thingsboard.server.dao.user.UserService; /** * Created by ashvayka on 19.03.18. @@ -26,27 +50,30 @@ class DefaultTbContext implements TbContext { @Override public void tellNext(TbMsg msg, String relationType) { - nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelfId(), relationType, msg), nodeCtx.getSelf()); + if (nodeCtx.getSelf().isDebugMode()) { + mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg); + } + nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelf().getId(), relationType, msg), nodeCtx.getSelfActor()); } @Override public void tellSelf(TbMsg msg, long delayMs) { - + throw new RuntimeException("Not Implemented!"); } @Override public void tellOthers(TbMsg msg) { - + throw new RuntimeException("Not Implemented!"); } @Override public void tellSibling(TbMsg msg, ServerAddress address) { - + throw new RuntimeException("Not Implemented!"); } @Override public void spawn(TbMsg msg) { - + throw new RuntimeException("Not Implemented!"); } @Override @@ -54,8 +81,61 @@ class DefaultTbContext implements TbContext { } + @Override + public void tellError(TbMsg msg, Throwable th) { + if (nodeCtx.getSelf().isDebugMode()) { + mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, th); + } + nodeCtx.getSelfActor().tell(new RuleNodeToSelfErrorMsg(msg, th), nodeCtx.getSelfActor()); + } + @Override public AttributesService getAttributesService() { return mainCtx.getAttributesService(); } + + @Override + public CustomerService getCustomerService() { + return mainCtx.getCustomerService(); + } + + @Override + public UserService getUserService() { + return mainCtx.getUserService(); + } + + @Override + public PluginService getPluginService() { + return mainCtx.getPluginService(); + } + + @Override + public AssetService getAssetService() { + return mainCtx.getAssetService(); + } + + @Override + public DeviceService getDeviceService() { + return mainCtx.getDeviceService(); + } + + @Override + public AlarmService getAlarmService() { + return mainCtx.getAlarmService(); + } + + @Override + public RuleChainService getRuleChainService() { + return mainCtx.getRuleChainService(); + } + + @Override + public TimeseriesService getTimeseriesService() { + return mainCtx.getTsService(); + } + + @Override + public RelationService getRelationService() { + return mainCtx.getRelationService(); + } } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java index 20ea05deb4..9c8de22376 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -33,7 +33,7 @@ public class RuleChainActor extends ComponentActor { @@ -69,4 +72,6 @@ public class RuleChainActor extends ComponentActor ruleNodeList = service.getRuleChainNodes(entityId); // Creating and starting the actors; @@ -74,8 +79,8 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor relations = nodeRoutes.get(originator); + if (relations == null) { + return; + } + boolean copy = relations.size() > 1; for (RuleNodeRelation relation : relations) { + TbMsg msg = envelope.getMsg(); + if (copy) { + msg = msg.copy(); + } if (targetRelationType == null || targetRelationType.equalsIgnoreCase(relation.getType())) { switch (relation.getOut().getEntityType()) { case RULE_NODE: RuleNodeId targetRuleNodeId = new RuleNodeId(relation.getOut().getId()); RuleNodeCtx targetRuleNode = nodeActors.get(targetRuleNodeId); - pushMstToNode(targetRuleNode, envelope.getMsg()); + pushMstToNode(targetRuleNode, msg); break; case RULE_CHAIN: // TODO: implement @@ -137,7 +154,13 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor { private static final long serialVersionUID = 1L; @@ -69,4 +89,6 @@ public class RuleNodeActor extends ComponentActor componentClazz = Class.forName(ruleNode.getType()); + TbNode tbNode = (TbNode) (componentClazz.newInstance()); + tbNode.init(new TbNodeConfiguration(ruleNode.getConfiguration()), new TbNodeState()); + return tbNode; } } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java index dd25f8bc85..90c67c2a06 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java @@ -1,15 +1,33 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; import akka.actor.ActorRef; import lombok.Data; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rule.RuleNode; /** * Created by ashvayka on 19.03.18. */ @Data final class RuleNodeCtx { + private final TenantId tenantId; private final ActorRef chainActor; - private final ActorRef self; - private final RuleNodeId selfId; + private final ActorRef selfActor; + private final RuleNode self; } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java index bd2d544eb3..7861e5473c 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeRelation.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; import lombok.Data; diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java index 95b362591d..054284dc59 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToRuleChainTellNextMsg.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; import lombok.Data; diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RulesProcessedMsg.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfErrorMsg.java similarity index 54% rename from application/src/main/java/org/thingsboard/server/actors/rule/RulesProcessedMsg.java rename to application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfErrorMsg.java index 82b6a6784e..4fc03ac671 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RulesProcessedMsg.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfErrorMsg.java @@ -13,22 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.actors.rule; +package org.thingsboard.server.actors.ruleChain; -public class RulesProcessedMsg { - private final ChainProcessingContext ctx; +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; - public RulesProcessedMsg(ChainProcessingContext ctx) { - super(); - this.ctx = ctx; - } +/** + * Created by ashvayka on 19.03.18. + */ +@Data +final class RuleNodeToSelfErrorMsg implements TbActorMsg { - public ChainProcessingContext getCtx() { - return ctx; - } + private final TbMsg msg; + private final Throwable error; @Override - public String toString() { - return "RulesProcessedMsg [ctx=" + ctx + "]"; + public MsgType getMsgType() { + return MsgType.RULE_TO_SELF_ERROR_MSG; } + } diff --git a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java b/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java index d0260dd974..6aa68d3c5b 100644 --- a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java @@ -141,7 +141,6 @@ public abstract class ComponentActor + * * 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 - *

+ * + * 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. diff --git a/application/src/main/java/org/thingsboard/server/actors/session/SessionActor.java b/application/src/main/java/org/thingsboard/server/actors/session/SessionActor.java index 37827d61fb..9d324c5b94 100644 --- a/application/src/main/java/org/thingsboard/server/actors/session/SessionActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/session/SessionActor.java @@ -23,6 +23,7 @@ import org.thingsboard.server.actors.service.ContextAwareActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.actors.shared.SessionTimeoutMsg; import org.thingsboard.server.common.data.id.SessionId; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; import org.thingsboard.server.common.msg.session.ToDeviceActorSessionMsg; @@ -60,6 +61,12 @@ public class SessionActor extends ContextAwareActor { }); } + @Override + protected boolean process(TbActorMsg msg) { + //TODO Move everything here, to work with TbActorMsg + return false; + } + @Override public void onReceive(Object msg) throws Exception { logger.debug("[{}] Processing: {}.", sessionId, msg); diff --git a/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java b/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java index 9d67dabeb8..b5b17917b9 100644 --- a/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java @@ -26,6 +26,7 @@ import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.actors.shared.SessionTimeoutMsg; import org.thingsboard.server.common.data.id.SessionId; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.aware.SessionAwareMsg; import akka.event.Logging; @@ -48,6 +49,12 @@ public class SessionManagerActor extends ContextAwareActor { this.sessionActors = new HashMap<>(INITIAL_SESSION_MAP_SIZE); } + @Override + protected boolean process(TbActorMsg msg) { + //TODO Move everything here, to work with TbActorMsg + return false; + } + @Override public void onReceive(Object msg) throws Exception { if (msg instanceof SessionCtrlMsg) { diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java index 917a6452c4..d4a1f34006 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/EntityActorsManager.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.actors.shared; import akka.actor.ActorContext; diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java index 5142de2c15..3345e5fff5 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/plugin/PluginManager.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rule/RuleManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rule/RuleManager.java deleted file mode 100644 index 95d762afdf..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rule/RuleManager.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.shared.rule; - -import akka.actor.ActorContext; -import akka.actor.ActorRef; -import akka.actor.Props; -import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.rule.RuleActor; -import org.thingsboard.server.actors.rule.RuleActorChain; -import org.thingsboard.server.actors.rule.RuleActorMetaData; -import org.thingsboard.server.actors.rule.SimpleRuleActorChain; -import org.thingsboard.server.actors.service.ContextAwareActor; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.PageDataIterable; -import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.dao.rule.RuleService; - -import java.util.*; - -@Slf4j -public abstract class RuleManager { - - protected final ActorSystemContext systemContext; - protected final RuleService ruleService; - protected final Map ruleActors; - protected final TenantId tenantId; - - private Map ruleMap; - private RuleActorChain ruleChain; - - public RuleManager(ActorSystemContext systemContext, TenantId tenantId) { - this.systemContext = systemContext; - this.ruleService = systemContext.getRuleService(); - this.ruleActors = new HashMap<>(); - this.tenantId = tenantId; - } - - public void init(ActorContext context) { - doInit(context); - } - - private void doInit(ActorContext context) { - PageDataIterable ruleIterator = new PageDataIterable<>(getFetchRulesFunction(), - ContextAwareActor.ENTITY_PACK_LIMIT); - ruleMap = new HashMap<>(); - - for (RuleMetaData rule : ruleIterator) { - log.debug("[{}] Creating rule actor {}", rule.getId(), rule); - ActorRef ref = getOrCreateRuleActor(context, rule.getId()); - ruleMap.put(rule, RuleActorMetaData.systemRule(rule.getId(), rule.getWeight(), ref)); - log.debug("[{}] Rule actor created.", rule.getId()); - } - - refreshRuleChain(); - } - - public Optional update(ActorContext context, RuleId ruleId, ComponentLifecycleEvent event) { - if (ruleMap == null) { - doInit(context); - } - RuleMetaData rule; - if (event != ComponentLifecycleEvent.DELETED) { - rule = systemContext.getRuleService().findRuleById(ruleId); - } else { - rule = ruleMap.keySet().stream() - .filter(r -> r.getId().equals(ruleId)) - .peek(r -> r.setState(ComponentLifecycleState.SUSPENDED)) - .findFirst() - .orElse(null); - if (rule != null) { - ruleMap.remove(rule); - ruleActors.remove(ruleId); - } - } - if (rule != null) { - RuleActorMetaData actorMd = ruleMap.get(rule); - if (actorMd == null) { - ActorRef ref = getOrCreateRuleActor(context, rule.getId()); - actorMd = RuleActorMetaData.systemRule(rule.getId(), rule.getWeight(), ref); - ruleMap.put(rule, actorMd); - } - refreshRuleChain(); - return Optional.of(actorMd.getActorRef()); - } else { - log.warn("[{}] Can't process unknown rule!", ruleId); - return Optional.empty(); - } - } - - abstract FetchFunction getFetchRulesFunction(); - - abstract String getDispatcherName(); - - public ActorRef getOrCreateRuleActor(ActorContext context, RuleId ruleId) { - return ruleActors.computeIfAbsent(ruleId, rId -> - context.actorOf(Props.create(new RuleActor.ActorCreator(systemContext, tenantId, rId)) - .withDispatcher(getDispatcherName()), rId.toString())); - } - - public RuleActorChain getRuleChain(ActorContext context) { - if (ruleChain == null) { - doInit(context); - } - return ruleChain; - } - - private void refreshRuleChain() { - Set activeRuleSet = new HashSet<>(); - for (Map.Entry rule : ruleMap.entrySet()) { - if (rule.getKey().getState() == ComponentLifecycleState.ACTIVE) { - activeRuleSet.add(rule.getValue()); - } - } - ruleChain = new SimpleRuleActorChain(activeRuleSet); - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rule/SystemRuleManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rule/SystemRuleManager.java deleted file mode 100644 index d10731caed..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rule/SystemRuleManager.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.shared.rule; - -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.dao.model.ModelConstants; - -public class SystemRuleManager extends RuleManager { - - public SystemRuleManager(ActorSystemContext systemContext) { - super(systemContext, new TenantId(ModelConstants.NULL_UUID)); - } - - @Override - FetchFunction getFetchRulesFunction() { - return ruleService::findSystemRules; - } - - @Override - String getDispatcherName() { - return DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME; - } -} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rule/TenantRuleManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rule/TenantRuleManager.java deleted file mode 100644 index e4d023ca90..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rule/TenantRuleManager.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.shared.rule; - -import akka.actor.ActorContext; -import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; -import org.thingsboard.server.common.data.rule.RuleMetaData; - -public class TenantRuleManager extends RuleManager { - - public TenantRuleManager(ActorSystemContext systemContext, TenantId tenantId) { - super(systemContext, tenantId); - } - - @Override - public void init(ActorContext context) { - if (systemContext.isTenantComponentsInitEnabled()) { - super.init(context); - } - } - - @Override - FetchFunction getFetchRulesFunction() { - return link -> ruleService.findTenantRules(tenantId, link); - } - - @Override - String getDispatcherName() { - return DefaultActorService.TENANT_RULE_DISPATCHER_NAME; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java index 97acb6cbfb..ff0c52ef45 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.actors.shared.rulechain; import akka.actor.ActorRef; diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java index aa2a63104a..731d8d8e6c 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -18,12 +18,9 @@ package org.thingsboard.server.actors.shared.rulechain; import akka.actor.ActorContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.actors.shared.rule.RuleManager; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.PageDataIterable; import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; import org.thingsboard.server.common.data.rule.RuleChain; -import org.thingsboard.server.common.data.rule.RuleMetaData; public class TenantRuleChainManager extends RuleChainManager { diff --git a/application/src/main/java/org/thingsboard/server/actors/stats/StatsActor.java b/application/src/main/java/org/thingsboard/server/actors/stats/StatsActor.java index ccc31cca29..8623370896 100644 --- a/application/src/main/java/org/thingsboard/server/actors/stats/StatsActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/stats/StatsActor.java @@ -24,6 +24,7 @@ import org.thingsboard.server.actors.service.ContextAwareActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; public class StatsActor extends ContextAwareActor { @@ -35,6 +36,12 @@ public class StatsActor extends ContextAwareActor { super(context); } + @Override + protected boolean process(TbActorMsg msg) { + //TODO Move everything here, to work with TbActorMsg\ + return false; + } + @Override public void onReceive(Object msg) throws Exception { logger.debug("Received message: {}", msg); diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/RuleChainDeviceMsg.java b/application/src/main/java/org/thingsboard/server/actors/tenant/RuleChainDeviceMsg.java deleted file mode 100644 index a84e0b5fd4..0000000000 --- a/application/src/main/java/org/thingsboard/server/actors/tenant/RuleChainDeviceMsg.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright © 2016-2018 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.actors.tenant; - -import org.thingsboard.server.actors.rule.RuleActorChain; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; - -public class RuleChainDeviceMsg { - - private final ToDeviceActorMsg toDeviceActorMsg; - private final RuleActorChain ruleChain; - - public RuleChainDeviceMsg(ToDeviceActorMsg toDeviceActorMsg, RuleActorChain ruleChain) { - super(); - this.toDeviceActorMsg = toDeviceActorMsg; - this.ruleChain = ruleChain; - } - - public ToDeviceActorMsg getToDeviceActorMsg() { - return toDeviceActorMsg; - } - - public RuleActorChain getRuleChain() { - return ruleChain; - } - -} diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java index a51e7a2187..d53c054414 100644 --- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -62,7 +62,7 @@ public class TenantActor extends RuleChainManagerActor { } @Override - protected void process(TbActorMsg msg) { + protected boolean process(TbActorMsg msg) { switch (msg.getMsgType()) { case COMPONENT_LIFE_CYCLE_MSG: onComponentLifecycleMsg((ComponentLifecycleMsg) msg); @@ -70,7 +70,10 @@ public class TenantActor extends RuleChainManagerActor { case SERVICE_TO_RULE_ENGINE_MSG: onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); break; + default: + return false; } + return true; } private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index 93891ac53a..c6befdd8ca 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -78,7 +78,7 @@ public class RuleChainController extends BaseController { ruleChain.setTenantId(getCurrentUser().getTenantId()); RuleChain savedRuleChain = checkNotNull(ruleChainService.saveRuleChain(ruleChain)); - actorService.onEntityStateChange(ruleChain.getTenantId(), ruleChain.getId(), + actorService.onEntityStateChange(ruleChain.getTenantId(), savedRuleChain.getId(), created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED); logEntityAction(savedRuleChain.getId(), savedRuleChain, diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java index 0a6081d8da..910b45954a 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java @@ -26,6 +26,10 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen import org.springframework.core.env.Environment; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.stereotype.Service; +import org.thingsboard.rule.engine.api.ActionNode; +import org.thingsboard.rule.engine.api.EnrichmentNode; +import org.thingsboard.rule.engine.api.FilterNode; +import org.thingsboard.rule.engine.api.TransformationNode; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.dao.component.ComponentDescriptorService; @@ -79,8 +83,7 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe private List persist(Set filterDefs, ComponentType type) { List result = new ArrayList<>(); for (BeanDefinition def : filterDefs) { - ComponentDescriptor scannedComponent = scanAndPersistComponent(def, type); - result.add(scannedComponent); + result.add(scanAndPersistComponent(def, type)); } return result; } @@ -93,24 +96,36 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe Class clazz = Class.forName(clazzName); String descriptorResourceName; switch (type) { + case ENRICHMENT: + EnrichmentNode enrichmentAnnotation = clazz.getAnnotation(EnrichmentNode.class); + scannedComponent.setName(enrichmentAnnotation.name()); + scannedComponent.setScope(enrichmentAnnotation.scope()); + descriptorResourceName = enrichmentAnnotation.descriptor(); + break; case FILTER: - Filter filterAnnotation = clazz.getAnnotation(Filter.class); + FilterNode filterAnnotation = clazz.getAnnotation(FilterNode.class); scannedComponent.setName(filterAnnotation.name()); scannedComponent.setScope(filterAnnotation.scope()); descriptorResourceName = filterAnnotation.descriptor(); break; - case PROCESSOR: - Processor processorAnnotation = clazz.getAnnotation(Processor.class); - scannedComponent.setName(processorAnnotation.name()); - scannedComponent.setScope(processorAnnotation.scope()); - descriptorResourceName = processorAnnotation.descriptor(); + case TRANSFORMATION: + TransformationNode trAnnotation = clazz.getAnnotation(TransformationNode.class); + scannedComponent.setName(trAnnotation.name()); + scannedComponent.setScope(trAnnotation.scope()); + descriptorResourceName = trAnnotation.descriptor(); break; case ACTION: - Action actionAnnotation = clazz.getAnnotation(Action.class); + ActionNode actionAnnotation = clazz.getAnnotation(ActionNode.class); scannedComponent.setName(actionAnnotation.name()); scannedComponent.setScope(actionAnnotation.scope()); descriptorResourceName = actionAnnotation.descriptor(); break; + case OLD_ACTION: + Action oldActionAnnotation = clazz.getAnnotation(Action.class); + scannedComponent.setName(oldActionAnnotation.name()); + scannedComponent.setScope(oldActionAnnotation.scope()); + descriptorResourceName = oldActionAnnotation.descriptor(); + break; case PLUGIN: Plugin pluginAnnotation = clazz.getAnnotation(Plugin.class); scannedComponent.setName(pluginAnnotation.name()); @@ -122,12 +137,12 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe log.error("Can't initialize plugin {}, due to missing action {}!", def.getBeanClassName(), actionClazz.getName()); return new ClassNotFoundException("Action: " + actionClazz.getName() + "is missing!"); }); - if (actionComponent.getType() != ComponentType.ACTION) { + if (actionComponent.getType() != ComponentType.OLD_ACTION) { log.error("Plugin {} action {} has wrong component type!", def.getBeanClassName(), actionClazz.getName(), actionComponent.getType()); throw new RuntimeException("Plugin " + def.getBeanClassName() + "action " + actionClazz.getName() + " has wrong component type!"); } } - scannedComponent.setActions(Arrays.stream(pluginAnnotation.actions()).map(action -> action.getName()).collect(Collectors.joining(","))); + scannedComponent.setActions(Arrays.stream(pluginAnnotation.actions()).map(Class::getName).collect(Collectors.joining(","))); break; default: throw new RuntimeException(type + " is not supported yet!"); @@ -168,11 +183,15 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe @Override public void discoverComponents() { - registerComponents(ComponentType.FILTER, Filter.class); + registerComponents(ComponentType.ENRICHMENT, EnrichmentNode.class); + + registerComponents(ComponentType.FILTER, FilterNode.class); + + registerComponents(ComponentType.TRANSFORMATION, TransformationNode.class); - registerComponents(ComponentType.PROCESSOR, Processor.class); + registerComponents(ComponentType.ACTION, ActionNode.class); - registerComponents(ComponentType.ACTION, Action.class); + registerComponents(ComponentType.OLD_ACTION, Action.class); registerComponents(ComponentType.PLUGIN, Plugin.class); @@ -199,7 +218,7 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe } List result = new ArrayList<>(); for (String action : plugin.getActions().split(",")) { - getComponent(action).ifPresent(v -> result.add(v)); + getComponent(action).ifPresent(result::add); } return result; } else { diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 778c2a3ffb..27585212db 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -62,7 +62,7 @@ cluster: # Plugins configuration parameters plugins: # Comma seperated package list used during classpath scanning for plugins - scan_packages: "${PLUGINS_SCAN_PACKAGES:org.thingsboard.server.extensions}" + scan_packages: "${PLUGINS_SCAN_PACKAGES:org.thingsboard.server.extensions,org.thingsboard.rule.engine}" # JWT Token parameters security.jwt: @@ -215,12 +215,12 @@ actors: termination.delay: "${ACTORS_RULE_TERMINATION_DELAY:30000}" # Errors for particular actor are persisted once per specified amount of milliseconds error_persist_frequency: "${ACTORS_RULE_ERROR_FREQUENCY:3000}" - chain: - # Errors for particular actor are persisted once per specified amount of milliseconds - error_persist_frequency: "${ACTORS_RULE_CHAIN_ERROR_FREQUENCY:3000}" - node: - # Errors for particular actor are persisted once per specified amount of milliseconds - error_persist_frequency: "${ACTORS_RULE_NODE_ERROR_FREQUENCY:3000}" + chain: + # Errors for particular actor are persisted once per specified amount of milliseconds + error_persist_frequency: "${ACTORS_RULE_CHAIN_ERROR_FREQUENCY:3000}" + node: + # Errors for particular actor are persisted once per specified amount of milliseconds + error_persist_frequency: "${ACTORS_RULE_NODE_ERROR_FREQUENCY:3000}" statistics: # Enable/disable actor statistics enabled: "${ACTORS_STATISTICS_ENABLED:true}" diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java index b92e464a6e..3ec4dc815b 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java @@ -96,6 +96,8 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC @Slf4j public abstract class AbstractControllerTest { + protected ObjectMapper mapper = new ObjectMapper(); + protected static final String TEST_TENANT_NAME = "TEST TENANT"; protected static final String SYS_ADMIN_EMAIL = "sysadmin@thingsboard.org"; diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java new file mode 100644 index 0000000000..9aa75745cf --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java @@ -0,0 +1,41 @@ +package org.thingsboard.server.controller; + +import com.fasterxml.jackson.core.type.TypeReference; +import org.thingsboard.server.common.data.DataConstants; +import org.thingsboard.server.common.data.Event; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TimePageData; +import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; + +/** + * Created by ashvayka on 20.03.18. + */ +public class AbstractRuleEngineControllerTest extends AbstractControllerTest{ + + protected RuleChain saveRuleChain(RuleChain ruleChain) throws Exception { + return doPost("/api/ruleChain", ruleChain, RuleChain.class); + } + + protected RuleChain getRuleChain(RuleChainId ruleChainId) throws Exception { + return doGet("/api/ruleChain/" + ruleChainId.getId().toString(), RuleChain.class); + } + + protected RuleChainMetaData saveRuleChainMetaData(RuleChainMetaData ruleChainMD) throws Exception { + return doPost("/api/ruleChain/metadata", ruleChainMD, RuleChainMetaData.class); + } + + protected RuleChainMetaData getRuleChainMetaData(RuleChainId ruleChainId) throws Exception { + return doGet("/api/ruleChain/metadata/" + ruleChainId.getId().toString(), RuleChainMetaData.class); + } + + protected TimePageData getDebugEvents(TenantId tenantId, EntityId entityId, int limit) throws Exception { + TimePageLink pageLink = new TimePageLink(limit); + return doGetTypedWithTimePageLink("/api/events/{entityType}/{entityId}/{eventType}?tenantId={tenantId}&", + new TypeReference>() { + }, pageLink, entityId.getEntityType(), entityId.getId(), DataConstants.DEBUG, tenantId.getId()); + } +} diff --git a/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java new file mode 100644 index 0000000000..136f76b496 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java @@ -0,0 +1,35 @@ +/** + * Copyright © 2016-2018 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.rules; + +import org.junit.ClassRule; +import org.junit.extensions.cpsuite.ClasspathSuite; +import org.junit.runner.RunWith; +import org.thingsboard.server.dao.CustomSqlUnit; + +import java.util.Arrays; + +@RunWith(ClasspathSuite.class) +@ClasspathSuite.ClassnameFilters({ + "org.thingsboard.server.rules.flow.*Test", "org.thingsboard.server.rules.lifecycle.*Test"}) +public class RuleEngineSqlTestSuite { + + @ClassRule + public static CustomSqlUnit sqlUnit = new CustomSqlUnit( + Arrays.asList("sql/schema.sql", "sql/system-data.sql"), + "sql/drop-all-tables.sql", + "sql-test.properties"); +} diff --git a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java new file mode 100644 index 0000000000..1f2f70997c --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java @@ -0,0 +1,156 @@ +/** + * Copyright © 2016-2018 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.rules.flow; + +import com.datastax.driver.core.utils.UUIDs; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration; +import org.thingsboard.server.actors.service.ActorService; +import org.thingsboard.server.common.data.*; +import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; +import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.page.TimePageData; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; +import org.thingsboard.server.controller.AbstractRuleEngineControllerTest; +import org.thingsboard.server.dao.attributes.AttributesService; + +import java.util.Collections; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * @author Valerii Sosliuk + */ +@Slf4j +public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRuleEngineControllerTest { + + private static final String MQTT_URL = "tcp://localhost:1883"; + private static final Long TIME_TO_HANDLE_REQUEST = 500L; + + private Tenant savedTenant; + private User tenantAdmin; + + @Autowired + private ActorService actorService; + + @Autowired + private AttributesService attributesService; + + @Before + public void beforeTest() throws Exception { + loginSysAdmin(); + + Tenant tenant = new Tenant(); + tenant.setTitle("My tenant"); + savedTenant = doPost("/api/tenant", tenant, Tenant.class); + Assert.assertNotNull(savedTenant); + + tenantAdmin = new User(); + tenantAdmin.setAuthority(Authority.TENANT_ADMIN); + tenantAdmin.setTenantId(savedTenant.getId()); + tenantAdmin.setEmail("tenant2@thingsboard.org"); + tenantAdmin.setFirstName("Joe"); + tenantAdmin.setLastName("Downs"); + + createUserAndLogin(tenantAdmin, "testPassword1"); + } + + @After + public void afterTest() throws Exception { + loginSysAdmin(); + if (savedTenant != null) { + doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk()); + } + } + + @Test + public void testSimpleRuleChainCreation() throws Exception { + // Creating Rule Chain + RuleChain ruleChain = new RuleChain(); + ruleChain.setName("Simple Rule Chain"); + ruleChain.setTenantId(savedTenant.getId()); + ruleChain.setRoot(true); + ruleChain.setDebugMode(true); + ruleChain = saveRuleChain(ruleChain); + Assert.assertNull(ruleChain.getFirstRuleNodeId()); + + RuleChainMetaData metaData = new RuleChainMetaData(); + metaData.setRuleChainId(ruleChain.getId()); + + RuleNode ruleNode = new RuleNode(); + ruleNode.setName("Simple Rule Node"); + ruleNode.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName()); + ruleNode.setDebugMode(true); + TbGetAttributesNodeConfiguration configuration = new TbGetAttributesNodeConfiguration(); + configuration.setServerAttributeNames(Collections.singletonList("serverAttributeKey")); + ruleNode.setConfiguration(mapper.valueToTree(configuration)); + + metaData.setNodes(Collections.singletonList(ruleNode)); + metaData.setFirstNodeIndex(0); + + metaData = saveRuleChainMetaData(metaData); + Assert.assertNotNull(metaData); + + ruleChain = getRuleChain(ruleChain.getId()); + Assert.assertNotNull(ruleChain.getFirstRuleNodeId()); + + // Saving the device + Device device = new Device(); + device.setName("My device"); + device.setType("default"); + device = doPost("/api/device", device, Device.class); + + attributesService.save(device.getId(), DataConstants.SERVER_SCOPE, + Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey", "serverAttributeValue"), System.currentTimeMillis()))); + + // Pushing Message to the system + TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), + "CUSTOM", + device.getId(), + new TbMsgMetaData(), + new byte[]{}); + actorService.onMsg(new ServiceToRuleEngineMsg(savedTenant.getId(), tbMsg)); + + Thread.sleep(3000); + + TimePageData events = getDebugEvents(savedTenant.getId(), ruleChain.getFirstRuleNodeId(), 1000); + + Assert.assertEquals(2, events.getData().size()); + + Event inEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.IN)).findFirst().get(); + Assert.assertEquals(ruleChain.getFirstRuleNodeId(), inEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), inEvent.getBody().get("entityId").asText()); + + Event outEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.OUT)).findFirst().get(); + Assert.assertEquals(ruleChain.getFirstRuleNodeId(), outEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); + + Assert.assertEquals("serverAttributeValue", outEvent.getBody().get("metadata").get("ss.serverAttributeKey").asText()); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorChain.java b/application/src/test/java/org/thingsboard/server/rules/flow/RuleEngineFlowSqlIntegrationTest.java similarity index 64% rename from application/src/main/java/org/thingsboard/server/actors/rule/RuleActorChain.java rename to application/src/test/java/org/thingsboard/server/rules/flow/RuleEngineFlowSqlIntegrationTest.java index 3f3bd36f65..18a164ef33 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorChain.java +++ b/application/src/test/java/org/thingsboard/server/rules/flow/RuleEngineFlowSqlIntegrationTest.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.actors.rule; +package org.thingsboard.server.rules.flow; -public interface RuleActorChain { - - int size(); - - RuleActorMetaData getRuleActorMd(int index); +import org.thingsboard.server.dao.service.DaoSqlTest; +import org.thingsboard.server.mqtt.rpc.AbstractMqttServerSideRpcIntegrationTest; +/** + * Created by Valerii Sosliuk on 8/22/2017. + */ +@DaoSqlTest +public class RuleEngineFlowSqlIntegrationTest extends AbstractRuleEngineFlowIntegrationTest { } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java index 5624ed801f..659a242882 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java @@ -37,9 +37,12 @@ public class DataConstants { public static final String ERROR = "ERROR"; public static final String LC_EVENT = "LC_EVENT"; public static final String STATS = "STATS"; - public static final String RULE_CHAIN_DEBUG = "DEBUG_RULE_CHAIN"; - public static final String RULE_NODE_DEBUG = "DEBUG_RULE_NODE"; + public static final String DEBUG = "DEBUG"; public static final String ONEWAY = "ONEWAY"; public static final String TWOWAY = "TWOWAY"; + + public static final String IN = "IN"; + public static final String OUT = "OUT"; + } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java index ab6accaf11..a1030640cb 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java @@ -20,6 +20,6 @@ package org.thingsboard.server.common.data.plugin; */ public enum ComponentType { - ENRICHMENT, FILTER, PROCESSOR, TRANSFORMATION, ACTION, PLUGIN + ENRICHMENT, FILTER, TRANSFORMATION, ACTION, OLD_ACTION, PLUGIN } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java index f2ba0cc66e..218061adb1 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java @@ -38,6 +38,7 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo im private String name; private RuleNodeId firstRuleNodeId; private boolean root; + private boolean debugMode; private transient JsonNode configuration; @JsonIgnore private byte[] configurationBytes; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java index d044000117..fbc1103dee 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java @@ -34,6 +34,7 @@ public class RuleNode extends SearchTextBasedWithAdditionalInfo impl private String type; private String name; + private boolean debugMode; private transient JsonNode configuration; @JsonIgnore private byte[] configurationBytes; diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java index 22fc4285a9..7c00ee64ab 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.msg; /** @@ -34,4 +49,9 @@ public enum MsgType { */ RULE_TO_RULE_CHAIN_TELL_NEXT_MSG, + /** + * Message that is sent by RuleActor implementation to RuleActor itself to log the error. + */ + RULE_TO_SELF_ERROR_MSG, + } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java index e7668ff227..c361c11c0e 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbActorMsg.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.msg; /** diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java index c689b24fe8..524cc5fe60 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -17,6 +17,7 @@ package org.thingsboard.server.common.msg; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; +import lombok.AllArgsConstructor; import lombok.Data; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; @@ -30,6 +31,7 @@ import java.util.UUID; * Created by ashvayka on 13.01.18. */ @Data +@AllArgsConstructor public final class TbMsg implements Serializable { private final UUID id; @@ -39,6 +41,15 @@ public final class TbMsg implements Serializable { private final TbMsgDataType dataType; private final byte[] data; + public TbMsg(UUID id, String type, EntityId originator, TbMsgMetaData metaData, byte[] data) { + this.id = id; + this.type = type; + this.originator = originator; + this.metaData = metaData; + this.dataType = TbMsgDataType.JSON; + this.data = data; + } + public static ByteBuffer toBytes(TbMsg msg) { MsgProtos.TbMsgProto.Builder builder = MsgProtos.TbMsgProto.newBuilder(); builder.setId(msg.getId().toString()); @@ -61,9 +72,7 @@ public final class TbMsg implements Serializable { public static TbMsg fromBytes(ByteBuffer buffer) { try { MsgProtos.TbMsgProto proto = MsgProtos.TbMsgProto.parseFrom(buffer.array()); - TbMsgMetaData metaData = new TbMsgMetaData(); - metaData.setData(proto.getMetaData().getDataMap()); - + TbMsgMetaData metaData = new TbMsgMetaData(proto.getMetaData().getDataMap()); EntityId entityId = EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()); TbMsgDataType dataType = TbMsgDataType.values()[proto.getDataType()]; return new TbMsg(UUID.fromString(proto.getId()), proto.getType(), entityId, metaData, dataType, proto.getData().toByteArray()); @@ -71,4 +80,11 @@ public final class TbMsg implements Serializable { throw new IllegalStateException("Could not parse protobuf for TbMsg", e); } } + + public TbMsg copy() { + int dataSize = data.length; + byte[] dataCopy = new byte[dataSize]; + System.arraycopy( data, 0, dataCopy, 0, data.length ); + return new TbMsg(id, type, originator, metaData.copy(), dataType, dataCopy); + } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java index b6e2d5a5c5..2e367e9536 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgDataType.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.msg; /** diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java index 1bbc7929e2..74a2d3f9c7 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,9 +15,12 @@ */ package org.thingsboard.server.common.msg; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -25,10 +28,15 @@ import java.util.concurrent.ConcurrentHashMap; * Created by ashvayka on 13.01.18. */ @Data +@NoArgsConstructor public final class TbMsgMetaData implements Serializable { private Map data = new ConcurrentHashMap<>(); + TbMsgMetaData(Map data) { + this.data = data; + } + public String getValue(String key) { return data.get(key); } @@ -37,4 +45,7 @@ public final class TbMsgMetaData implements Serializable { data.put(key, value); } + public TbMsgMetaData copy() { + return new TbMsgMetaData(new ConcurrentHashMap<>(data)); + } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java index 315eb86f6c..c104281ffe 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/plugin/ComponentLifecycleMsg.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java index 3d82033b31..0792b63c28 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/system/ServiceToRuleEngineMsg.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.msg.system; import lombok.Data; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index a159b9e6ec..8c34cd3540 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -332,6 +332,8 @@ public class ModelConstants { public static final String EVENT_BY_TYPE_AND_ID_VIEW_NAME = "event_by_type_and_id"; public static final String EVENT_BY_ID_VIEW_NAME = "event_by_id"; + public static final String DEBUG_MODE = "debug_mode"; + /** * Cassandra rule chain constants. */ diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java index 34659a83df..bfec3900a7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -22,6 +22,8 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.fasterxml.jackson.databind.JsonNode; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import lombok.ToString; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; @@ -54,6 +56,10 @@ public class RuleChainEntity implements SearchTextEntity { private UUID firstRuleNodeId; @Column(name = RULE_CHAIN_ROOT_PROPERTY) private boolean root; + @Getter + @Setter + @Column(name = DEBUG_MODE) + private boolean debugMode; @Column(name = RULE_CHAIN_CONFIGURATION_PROPERTY, codec = JsonCodec.class) private JsonNode configuration; @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) @@ -71,6 +77,7 @@ public class RuleChainEntity implements SearchTextEntity { this.searchText = ruleChain.getName(); this.firstRuleNodeId = DaoUtil.getId(ruleChain.getFirstRuleNodeId()); this.root = ruleChain.isRoot(); + this.debugMode = ruleChain.isDebugMode(); this.configuration = ruleChain.getConfiguration(); this.additionalInfo = ruleChain.getAdditionalInfo(); } @@ -157,6 +164,7 @@ public class RuleChainEntity implements SearchTextEntity { ruleChain.setFirstRuleNodeId(new RuleNodeId(this.firstRuleNodeId)); } ruleChain.setRoot(this.root); + ruleChain.setDebugMode(this.debugMode); ruleChain.setConfiguration(this.configuration); ruleChain.setAdditionalInfo(this.additionalInfo); return ruleChain; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java index ba96e4b98e..8d3f3c3eaf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java @@ -21,6 +21,8 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.fasterxml.jackson.databind.JsonNode; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import lombok.ToString; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.rule.RuleNode; @@ -49,6 +51,11 @@ public class RuleNodeEntity implements SearchTextEntity { private JsonNode configuration; @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; + @Getter + @Setter + @Column(name = DEBUG_MODE) + private boolean debugMode; + public RuleNodeEntity() { } @@ -59,6 +66,7 @@ public class RuleNodeEntity implements SearchTextEntity { } this.type = ruleNode.getType(); this.name = ruleNode.getName(); + this.debugMode = ruleNode.isDebugMode(); this.searchText = ruleNode.getName(); this.configuration = ruleNode.getConfiguration(); this.additionalInfo = ruleNode.getAdditionalInfo(); @@ -126,6 +134,7 @@ public class RuleNodeEntity implements SearchTextEntity { ruleNode.setCreatedTime(UUIDs.unixTimestamp(id)); ruleNode.setType(this.type); ruleNode.setName(this.name); + ruleNode.setDebugMode(this.debugMode); ruleNode.setConfiguration(this.configuration); ruleNode.setAdditionalInfo(this.additionalInfo); return ruleNode; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java index 471ec7b06b..a48421a96a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java @@ -58,6 +58,9 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT @Column(name = ModelConstants.RULE_CHAIN_ROOT_PROPERTY) private boolean root; + @Column(name = ModelConstants.DEBUG_MODE) + private boolean debugMode; + @Type(type = "json") @Column(name = ModelConstants.RULE_CHAIN_CONFIGURATION_PROPERTY) private JsonNode configuration; @@ -80,6 +83,7 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT this.firstRuleNodeId = UUIDConverter.fromTimeUUID(ruleChain.getFirstRuleNodeId().getId()); } this.root = ruleChain.isRoot(); + this.debugMode = ruleChain.isDebugMode(); this.configuration = ruleChain.getConfiguration(); this.additionalInfo = ruleChain.getAdditionalInfo(); } @@ -104,6 +108,7 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT ruleChain.setFirstRuleNodeId(new RuleNodeId(UUIDConverter.fromString(firstRuleNodeId))); } ruleChain.setRoot(root); + ruleChain.setDebugMode(debugMode); ruleChain.setConfiguration(configuration); ruleChain.setAdditionalInfo(additionalInfo); return ruleChain; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java index d96048756c..6a888c2d72 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java @@ -56,6 +56,9 @@ public class RuleNodeEntity extends BaseSqlEntity implements SearchTex @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; + @Column(name = ModelConstants.DEBUG_MODE) + private boolean debugMode; + public RuleNodeEntity() { } @@ -65,6 +68,7 @@ public class RuleNodeEntity extends BaseSqlEntity implements SearchTex } this.type = ruleNode.getType(); this.name = ruleNode.getName(); + this.debugMode = ruleNode.isDebugMode(); this.searchText = ruleNode.getName(); this.configuration = ruleNode.getConfiguration(); this.additionalInfo = ruleNode.getAdditionalInfo(); @@ -86,6 +90,7 @@ public class RuleNodeEntity extends BaseSqlEntity implements SearchTex ruleNode.setCreatedTime(UUIDs.unixTimestamp(getId())); ruleNode.setType(type); ruleNode.setName(name); + ruleNode.setDebugMode(debugMode); ruleNode.setConfiguration(configuration); ruleNode.setAdditionalInfo(additionalInfo); return ruleNode; diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java index da991fa97d..bb76b97b18 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java +++ b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java @@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.TbMsgMetaData; import javax.annotation.Nullable; @@ -125,7 +126,7 @@ public class QueueBenchmark implements CommandLineRunner { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("key", "value"); String dataStr = "someContent"; - return new TbMsg(UUIDs.timeBased(), "type", null, metaData, dataStr.getBytes()); + return new TbMsg(UUIDs.timeBased(), "type", null, metaData, TbMsgDataType.JSON, dataStr.getBytes()); } @Bean diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 04207ec2f5..3daed33045 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -219,6 +219,12 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC return ruleChainDao.findById(ruleChainId.getId()); } + @Override + public RuleNode findRuleNodeById(RuleNodeId ruleNodeId) { + Validator.validateId(ruleNodeId, "Incorrect rule node id for search request."); + return ruleNodeDao.findById(ruleNodeId.getId()); + } + @Override public ListenableFuture findRuleChainByIdAsync(RuleChainId ruleChainId) { Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); @@ -325,7 +331,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC } if (ruleChain.isRoot()) { RuleChain rootRuleChain = getRootTenantRuleChain(ruleChain.getTenantId()); - if (ruleChain.getId() == null || !ruleChain.getId().equals(rootRuleChain.getId())) { + if (rootRuleChain != null && !rootRuleChain.getId().equals(ruleChain.getId())) { throw new DataValidationException("Another root rule chain is present in scope of current tenant!"); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java index e5f2840b8b..da7833d696 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java @@ -42,6 +42,8 @@ public interface RuleChainService { RuleChain findRuleChainById(RuleChainId ruleChainId); + RuleNode findRuleNodeById(RuleNodeId ruleNodeId); + ListenableFuture findRuleChainByIdAsync(RuleChainId ruleChainId); RuleChain getRootTenantRuleChain(TenantId tenantId); diff --git a/dao/src/main/resources/cassandra/schema.cql b/dao/src/main/resources/cassandra/schema.cql index 42c13f3ee6..d0e62b2827 100644 --- a/dao/src/main/resources/cassandra/schema.cql +++ b/dao/src/main/resources/cassandra/schema.cql @@ -669,6 +669,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_chain ( search_text text, first_rule_node_id uuid, root boolean, + debug_mode boolean, configuration text, additional_info text, PRIMARY KEY (id, tenant_id) @@ -685,6 +686,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_node ( id uuid, type text, name text, + debug_mode boolean, search_text text, configuration text, additional_info text, diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql index 106204ab64..d7a0978140 100644 --- a/dao/src/main/resources/sql/schema.sql +++ b/dao/src/main/resources/sql/schema.sql @@ -263,6 +263,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( name varchar(255), first_rule_node_id varchar(31), root boolean, + debug_mode boolean, search_text varchar(255), tenant_id varchar(31) ); @@ -273,5 +274,6 @@ CREATE TABLE IF NOT EXISTS rule_node ( configuration varchar(10000000), type varchar(255), name varchar(255), + debug_mode boolean, search_text varchar(255) ); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index d083a90262..44a1a0927b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -217,10 +217,10 @@ public abstract class AbstractServiceTest { ruleMetaData.setWeight(weight); ruleMetaData.setPluginToken(pluginToken); - ruleMetaData.setAction(createNode(ComponentScope.TENANT, ComponentType.ACTION, + ruleMetaData.setAction(createNode(ComponentScope.TENANT, ComponentType.OLD_ACTION, "org.thingsboard.component.ActionTest", "TestJsonDescriptor.json", "TestJsonData.json")); - ruleMetaData.setProcessor(createNode(ComponentScope.TENANT, ComponentType.PROCESSOR, - "org.thingsboard.component.ProcessorTest", "TestJsonDescriptor.json", "TestJsonData.json")); +// ruleMetaData.setProcessor(createNode(ComponentScope.TENANT, ComponentType.PROCESSOR, +// "org.thingsboard.component.ProcessorTest", "TestJsonDescriptor.json", "TestJsonData.json")); ruleMetaData.setFilters(mapper.createArrayNode().add( createNode(ComponentScope.TENANT, ComponentType.FILTER, "org.thingsboard.component.FilterTest", "TestJsonDescriptor.json", "TestJsonData.json") diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/UnprocessedMsgFilterTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/UnprocessedMsgFilterTest.java index 6302e63f89..3935c9b92e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/UnprocessedMsgFilterTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/UnprocessedMsgFilterTest.java @@ -33,8 +33,8 @@ public class UnprocessedMsgFilterTest { public void acknowledgedMsgsAreFilteredOut() { UUID id1 = UUID.randomUUID(); UUID id2 = UUID.randomUUID(); - TbMsg msg1 = new TbMsg(id1, "T", null, null, null); - TbMsg msg2 = new TbMsg(id2, "T", null, null, null); + TbMsg msg1 = new TbMsg(id1, "T", null, null, null, null); + TbMsg msg2 = new TbMsg(id2, "T", null, null, null, null); List msgs = Lists.newArrayList(msg1, msg2); List acks = Lists.newArrayList(new MsgAck(id2, UUID.randomUUID(), 1L, 1L)); Collection actual = msgFilter.filter(msgs, acks); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java index d17e1f2819..99c6a91f84 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.dao.service.AbstractServiceTest; import org.thingsboard.server.dao.service.DaoNoSqlTest; @@ -44,7 +45,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { @Test public void msgCanBeSavedAndRead() throws ExecutionException, InterruptedException { - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, new byte[4]); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 1L, 1L, 1L); future.get(); @@ -54,7 +55,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { @Test public void expiredMsgsAreNotReturned() throws ExecutionException, InterruptedException { - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, new byte[4]); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 2L, 2L, 2L); future.get(); @@ -67,7 +68,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("key", "value"); String dataStr = "someContent"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), metaData, dataStr.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), metaData, TbMsgDataType.JSON, dataStr.getBytes()); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 1L, 1L, 1L); future.get(); diff --git a/pom.xml b/pom.xml index f331e32fb2..f0c915a5b0 100755 --- a/pom.xml +++ b/pom.xml @@ -378,6 +378,11 @@ rule-engine-api ${project.version} + + org.thingsboard.rule-engine + rule-engine-components + ${project.version} + org.thingsboard.common message diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java new file mode 100644 index 0000000000..64e28f1bf2 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java @@ -0,0 +1,43 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Andrew Shvayka + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface ActionNode { + + String name(); + + ComponentScope scope() default ComponentScope.TENANT; + + String descriptor() default "EmptyNodeDescriptor.json"; + + String[] relationTypes() default {"Success","Failure"}; + + boolean customRelations() default false; + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java new file mode 100644 index 0000000000..2267bdae67 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Andrew Shvayka + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface EnrichmentNode { + + String name(); + + ComponentScope scope() default ComponentScope.TENANT; + + String descriptor() default "EmptyNodeDescriptor.json"; + + String[] relationTypes() default {"Success","Failure"}; + + boolean customRelations() default false; +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java new file mode 100644 index 0000000000..5247e397dd --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java @@ -0,0 +1,43 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Andrew Shvayka + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface FilterNode { + + String name(); + + ComponentScope scope() default ComponentScope.TENANT; + + String descriptor() default "EmptyNodeDescriptor.json"; + + String[] relationTypes() default {"Success","Failure"}; + + boolean customRelations() default false; + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index ede076be4a..a105d20ada 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -58,8 +58,6 @@ public interface TbContext { UserService getUserService(); - RuleService getRuleService(); - PluginService getPluginService(); AssetService getAssetService(); diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeConfiguration.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeConfiguration.java index d06c0d277b..64053cd61c 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeConfiguration.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeConfiguration.java @@ -22,8 +22,8 @@ import lombok.Data; * Created by ashvayka on 19.01.18. */ @Data -public class TbNodeConfiguration { +public final class TbNodeConfiguration { - private JsonNode data; + private final JsonNode data; } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeState.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeState.java index c48b11d387..2c77a69ba3 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeState.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNodeState.java @@ -18,5 +18,5 @@ package org.thingsboard.rule.engine.api; /** * Created by ashvayka on 19.01.18. */ -public class TbNodeState { +public final class TbNodeState { } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java new file mode 100644 index 0000000000..bfe1dcaeda --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java @@ -0,0 +1,43 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Andrew Shvayka + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface TransformationNode { + + String name(); + + ComponentScope scope() default ComponentScope.TENANT; + + String descriptor() default "EmptyNodeDescriptor.json"; + + String[] relationTypes() default {"Success","Failure"}; + + boolean customRelations() default false; + +} diff --git a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json new file mode 100644 index 0000000000..7a73a41bfd --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml index 9b903b1b00..a97493bdd7 100644 --- a/rule-engine/rule-engine-components/pom.xml +++ b/rule-engine/rule-engine-components/pom.xml @@ -88,11 +88,6 @@ mockito-all test - - org.junit.jupiter - junit-jupiter-api - RELEASE - diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 4d41921740..ac12f95eab 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,6 +15,7 @@ */ package org.thingsboard.rule.engine.metadata; +import com.google.common.base.Function; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -33,6 +34,7 @@ import static org.thingsboard.server.common.data.DataConstants.*; * Created by ashvayka on 19.01.18. */ @Slf4j +@EnrichmentNode(name = "Get Attributes Node") public class TbGetAttributesNode implements TbNode { private TbGetAttributesNodeConfiguration config; @@ -52,14 +54,20 @@ public class TbGetAttributesNode implements TbNode { withCallback(future, i -> ctx.tellNext(msg), t -> ctx.tellError(msg, t)); } - private ListenableFuture putAttributesAsync(TbMsg msg, List attributes, String prefix) { - attributes.forEach(r -> msg.getMetaData().putValue(prefix + r.getKey(), r.getValueAsString())); - return Futures.immediateFuture(null); + private Void putAttributesAsync(TbMsg msg, List attributes, String prefix) { + if (attributes != null) { + attributes.forEach(r -> msg.getMetaData().putValue(prefix + r.getKey(), r.getValueAsString())); + } + return null; } private ListenableFuture putAttrAsync(TbContext ctx, TbMsg msg, String scope, List attributes, String prefix) { - return Futures.transform(ctx.getAttributesService().find(msg.getOriginator(), scope, attributes), - (AsyncFunction, Void>) i -> putAttributesAsync(msg, i, prefix)); + if (attributes != null) { + return Futures.transform(ctx.getAttributesService().find(msg.getOriginator(), scope, attributes), + (Function, Void>) i -> putAttributesAsync(msg, i, prefix)); + } else { + return Futures.immediateFuture(null); + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index 57f9b79e7b..2e3d6172fa 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -18,11 +18,13 @@ package org.thingsboard.rule.engine.metadata; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.rule.engine.api.EnrichmentNode; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.server.common.data.HasCustomerId; import org.thingsboard.server.common.data.id.*; +@EnrichmentNode(name="Get Customer Attributes Node") public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 5823c181de..83aa4e2c17 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -20,10 +20,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.apache.commons.collections.CollectionUtils; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; @@ -33,6 +30,7 @@ import java.util.List; import static org.thingsboard.server.common.data.relation.RelationTypeGroup.COMMON; +@EnrichmentNode(name="Get Related Entity Attributes Node") public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index 2cf9a97d20..a1b05162dc 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -19,6 +19,7 @@ import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.api.EnrichmentNode; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.server.common.data.HasTenantId; @@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.alarm.AlarmId; import org.thingsboard.server.common.data.id.*; @Slf4j +@EnrichmentNode(name="Get Tenant Attributes Node") public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override @@ -38,8 +40,6 @@ public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { return getTenantAsync(ctx.getCustomerService().findCustomerByIdAsync((CustomerId) originator)); case USER: return getTenantAsync(ctx.getUserService().findUserByIdAsync((UserId) originator)); - case RULE: - return getTenantAsync(ctx.getRuleService().findRuleByIdAsync((RuleId) originator)); case PLUGIN: return getTenantAsync(ctx.getPluginService().findPluginByIdAsync((PluginId) originator)); case ASSET: diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index 8e5ddb8069..ad40f03006 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -85,8 +85,7 @@ public class TbGetCustomerAttributeNodeTest { config.setAttrMapping(attrMapping); config.setTelemetry(false); ObjectMapper mapper = new ObjectMapper(); - TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); - nodeConfiguration.setData(mapper.valueToTree(config)); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbGetCustomerAttributeNode(); node.init(nodeConfiguration, null); @@ -224,8 +223,7 @@ public class TbGetCustomerAttributeNodeTest { config.setAttrMapping(attrMapping); config.setTelemetry(true); ObjectMapper mapper = new ObjectMapper(); - TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(); - nodeConfiguration.setData(mapper.valueToTree(config)); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbGetCustomerAttributeNode(); node.init(nodeConfiguration, null); From 5752ba81a43a75f542a405467081ff449c0575e4 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 21 Mar 2018 14:41:27 +0200 Subject: [PATCH 17/75] Implementation of Flows in Rule Engine --- .../actors/ruleChain/RuleChainActor.java | 13 +- .../RuleChainActorMessageProcessor.java | 87 ++++++---- .../ruleChain/RuleChainToRuleNodeMsg.java | 1 - .../actors/ruleChain/RuleNodeActor.java | 6 +- .../RuleNodeActorMessageProcessor.java | 27 +-- .../server/actors/ruleChain/RuleNodeCtx.java | 1 - .../ruleChain/RuleNodeToSelfErrorMsg.java | 1 - .../actors/shared/ComponentMsgProcessor.java | 8 + .../AbstractRuleEngineControllerTest.java | 2 +- .../server/rules/RuleEngineSqlTestSuite.java | 2 +- ...AbstractRuleEngineFlowIntegrationTest.java | 70 ++++++-- ...actRuleEngineLifecycleIntegrationTest.java | 158 +++++++++++++++++ ...RuleEngineLifecycleSqlIntegrationTest.java | 26 +++ .../common/data/rule/NodeConnectionInfo.java | 15 +- .../data/rule/RuleChainConnectionInfo.java | 16 +- .../common/data/rule/RuleChainMetaData.java | 14 -- .../server/dao/rule/BaseRuleChainService.java | 8 +- .../dao/service/rule/BaseRuleServiceTest.java | 163 ------------------ 18 files changed, 363 insertions(+), 255 deletions(-) create mode 100644 application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java create mode 100644 application/src/test/java/org/thingsboard/server/rules/lifecycle/RuleEngineLifecycleSqlIntegrationTest.java rename dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java => common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java (71%) rename dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java => common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java (66%) delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java index 9c8de22376..f539e32a3c 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -15,6 +15,8 @@ */ package org.thingsboard.server.actors.ruleChain; +import akka.actor.OneForOneStrategy; +import akka.actor.SupervisorStrategy; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.service.ComponentActor; import org.thingsboard.server.actors.service.ContextBasedCreator; @@ -23,6 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; +import scala.concurrent.duration.Duration; public class RuleChainActor extends ComponentActor { @@ -73,5 +76,13 @@ public class RuleChainActor extends ComponentActor { + logAndPersist("Unknown Failure", ActorSystemContext.toException(t)); + return SupervisorStrategy.resume(); + }); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java index 7636152d2d..a853b1576b 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -27,12 +27,14 @@ import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; +import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.dao.rule.RuleChainService; @@ -40,6 +42,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * @author Andrew Shvayka @@ -54,7 +58,6 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor ruleNodeList = service.getRuleChainNodes(entityId); // Creating and starting the actors; for (RuleNode ruleNode : ruleNodeList) { - String dispatcherName = tenantId.getId().equals(EntityId.NULL_UUID) ? - DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME : DefaultActorService.TENANT_RULE_DISPATCHER_NAME; - ActorRef ruleNodeActor = context.actorOf( - Props.create(new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getId())) - .withDispatcher(dispatcherName), ruleNode.getId().toString()); + ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode); nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode)); } + initRoutes(ruleChain, ruleNodeList); + } + + @Override + public void onUpdate(ActorContext context) throws Exception { + RuleChain ruleChain = service.findRuleChainById(entityId); + List ruleNodeList = service.getRuleChainNodes(entityId); + + for (RuleNode ruleNode : ruleNodeList) { + RuleNodeCtx existing = nodeActors.get(ruleNode.getId()); + if (existing == null) { + ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode); + nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode)); + } else { + existing.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, existing.getSelf().getId(), ComponentLifecycleEvent.UPDATED), self); + } + } + + Set existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet()); + List removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList()); + removedRules.forEach(ruleNodeId -> { + RuleNodeCtx removed = nodeActors.remove(ruleNodeId); + removed.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED), self); + }); + + initRoutes(ruleChain, ruleNodeList); + } + + @Override + public void stop(ActorContext context) throws Exception { + nodeActors.values().stream().map(RuleNodeCtx::getSelfActor).forEach(context::stop); + nodeActors.clear(); + nodeRoutes.clear(); + context.stop(self); + } + + @Override + public void onClusterEventMsg(ClusterEventMsg msg) throws Exception { + + } + + private ActorRef createRuleNodeActor(ActorContext context, RuleNode ruleNode) { + String dispatcherName = tenantId.getId().equals(EntityId.NULL_UUID) ? + DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME : DefaultActorService.TENANT_RULE_DISPATCHER_NAME; + return context.actorOf( + Props.create(new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getId())) + .withDispatcher(dispatcherName), ruleNode.getId().toString()); + } + + private void initRoutes(RuleChain ruleChain, List ruleNodeList) { + nodeRoutes.clear(); // Populating the routes map; for (RuleNode ruleNode : ruleNodeList) { List relations = service.getRuleNodeRelations(ruleNode.getId()); @@ -102,19 +149,6 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor relations = nodeRoutes.get(originator); if (relations == null) { return; @@ -153,12 +186,8 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor { @@ -37,6 +38,9 @@ public class RuleNodeActor extends ComponentActor extends AbstractContextAwareMsgProcessor { protected final TenantId tenantId; protected final T entityId; + protected ComponentLifecycleState state; protected ComponentMsgProcessor(ActorSystemContext systemContext, LoggingAdapter logger, TenantId tenantId, T id) { super(systemContext, logger); @@ -67,4 +69,10 @@ public abstract class ComponentMsgProcessor extends AbstractContextAwareMsgPr public void scheduleStatsPersistTick(ActorContext context, long statsPersistFrequency) { schedulePeriodicMsgWithDelay(context, new StatsPersistTick(), statsPersistFrequency, statsPersistFrequency); } + + protected void checkActive() { + if (state != ComponentLifecycleState.ACTIVE) { + throw new IllegalStateException("Rule chain is not active!"); + } + } } diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java index 7997024e32..bbcb98ff48 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java @@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData; /** * Created by ashvayka on 20.03.18. */ -public class AbstractRuleEngineControllerTest extends AbstractControllerTest{ +public class AbstractRuleEngineControllerTest extends AbstractControllerTest { protected RuleChain saveRuleChain(RuleChain ruleChain) throws Exception { return doPost("/api/ruleChain", ruleChain, RuleChain.class); diff --git a/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java index 136f76b496..65b4293490 100644 --- a/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java @@ -24,7 +24,7 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClasspathSuite.ClassnameFilters({ - "org.thingsboard.server.rules.flow.*Test", "org.thingsboard.server.rules.lifecycle.*Test"}) + "org.thingsboard.server.rules.flow.*Test"}) public class RuleEngineSqlTestSuite { @ClassRule diff --git a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java index 5b8216b026..acbace6ae7 100644 --- a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java @@ -38,7 +38,9 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.controller.AbstractRuleEngineControllerTest; import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.rule.RuleChainService; +import java.util.Arrays; import java.util.Collections; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -49,17 +51,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRuleEngineControllerTest { - private static final String MQTT_URL = "tcp://localhost:1883"; - private static final Long TIME_TO_HANDLE_REQUEST = 500L; + protected Tenant savedTenant; + protected User tenantAdmin; - private Tenant savedTenant; - private User tenantAdmin; + @Autowired + protected ActorService actorService; @Autowired - private ActorService actorService; + protected AttributesService attributesService; @Autowired - private AttributesService attributesService; + protected RuleChainService ruleChainService; @Before public void beforeTest() throws Exception { @@ -89,7 +91,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule } @Test - public void testSimpleRuleChainCreation() throws Exception { + public void testRuleChainWithTwoRules() throws Exception { // Creating Rule Chain RuleChain ruleChain = new RuleChain(); ruleChain.setName("Simple Rule Chain"); @@ -102,17 +104,26 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule RuleChainMetaData metaData = new RuleChainMetaData(); metaData.setRuleChainId(ruleChain.getId()); - RuleNode ruleNode = new RuleNode(); - ruleNode.setName("Simple Rule Node"); - ruleNode.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName()); - ruleNode.setDebugMode(true); - TbGetAttributesNodeConfiguration configuration = new TbGetAttributesNodeConfiguration(); - configuration.setServerAttributeNames(Collections.singletonList("serverAttributeKey")); - ruleNode.setConfiguration(mapper.valueToTree(configuration)); + RuleNode ruleNode1 = new RuleNode(); + ruleNode1.setName("Simple Rule Node 1"); + ruleNode1.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName()); + ruleNode1.setDebugMode(true); + TbGetAttributesNodeConfiguration configuration1 = new TbGetAttributesNodeConfiguration(); + configuration1.setServerAttributeNames(Collections.singletonList("serverAttributeKey1")); + ruleNode1.setConfiguration(mapper.valueToTree(configuration1)); - metaData.setNodes(Collections.singletonList(ruleNode)); - metaData.setFirstNodeIndex(0); + RuleNode ruleNode2 = new RuleNode(); + ruleNode2.setName("Simple Rule Node 2"); + ruleNode2.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName()); + ruleNode2.setDebugMode(true); + TbGetAttributesNodeConfiguration configuration2 = new TbGetAttributesNodeConfiguration(); + configuration2.setServerAttributeNames(Collections.singletonList("serverAttributeKey2")); + ruleNode2.setConfiguration(mapper.valueToTree(configuration2)); + + metaData.setNodes(Arrays.asList(ruleNode1, ruleNode2)); + metaData.setFirstNodeIndex(0); + metaData.addConnectionInfo(0, 1, "Success"); metaData = saveRuleChainMetaData(metaData); Assert.assertNotNull(metaData); @@ -126,7 +137,12 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule device = doPost("/api/device", device, Device.class); attributesService.save(device.getId(), DataConstants.SERVER_SCOPE, - Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey", "serverAttributeValue"), System.currentTimeMillis()))); + Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey1", "serverAttributeValue1"), System.currentTimeMillis()))); + attributesService.save(device.getId(), DataConstants.SERVER_SCOPE, + Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey2", "serverAttributeValue2"), System.currentTimeMillis()))); + + + Thread.sleep(1000); // Pushing Message to the system TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), @@ -150,7 +166,25 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule Assert.assertEquals(ruleChain.getFirstRuleNodeId(), outEvent.getEntityId()); Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); - Assert.assertEquals("serverAttributeValue", outEvent.getBody().get("metadata").get("ss.serverAttributeKey").asText()); + Assert.assertEquals("serverAttributeValue1", outEvent.getBody().get("metadata").get("ss.serverAttributeKey1").asText()); + + RuleChain finalRuleChain = ruleChain; + RuleNode lastRuleNode = metaData.getNodes().stream().filter(node -> !node.getId().equals(finalRuleChain.getFirstRuleNodeId())).findFirst().get(); + + events = getDebugEvents(savedTenant.getId(), lastRuleNode.getId(), 1000); + + Assert.assertEquals(2, events.getData().size()); + + inEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.IN)).findFirst().get(); + Assert.assertEquals(lastRuleNode.getId(), inEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), inEvent.getBody().get("entityId").asText()); + + outEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.OUT)).findFirst().get(); + Assert.assertEquals(lastRuleNode.getId(), outEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); + + Assert.assertEquals("serverAttributeValue1", outEvent.getBody().get("metadata").get("ss.serverAttributeKey1").asText()); + Assert.assertEquals("serverAttributeValue2", outEvent.getBody().get("metadata").get("ss.serverAttributeKey2").asText()); } } diff --git a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java new file mode 100644 index 0000000000..de690a745f --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java @@ -0,0 +1,158 @@ +/** + * Copyright © 2016-2018 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.rules.lifecycle; + +import com.datastax.driver.core.utils.UUIDs; +import lombok.extern.slf4j.Slf4j; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration; +import org.thingsboard.server.actors.service.ActorService; +import org.thingsboard.server.common.data.DataConstants; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.Event; +import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; +import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.page.TimePageData; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; +import org.thingsboard.server.controller.AbstractRuleEngineControllerTest; +import org.thingsboard.server.dao.attributes.AttributesService; + +import java.util.Collections; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * @author Valerii Sosliuk + */ +@Slf4j +public abstract class AbstractRuleEngineLifecycleIntegrationTest extends AbstractRuleEngineControllerTest { + + protected Tenant savedTenant; + protected User tenantAdmin; + + @Autowired + protected ActorService actorService; + + @Autowired + protected AttributesService attributesService; + + @Before + public void beforeTest() throws Exception { + loginSysAdmin(); + + Tenant tenant = new Tenant(); + tenant.setTitle("My tenant"); + savedTenant = doPost("/api/tenant", tenant, Tenant.class); + Assert.assertNotNull(savedTenant); + + tenantAdmin = new User(); + tenantAdmin.setAuthority(Authority.TENANT_ADMIN); + tenantAdmin.setTenantId(savedTenant.getId()); + tenantAdmin.setEmail("tenant2@thingsboard.org"); + tenantAdmin.setFirstName("Joe"); + tenantAdmin.setLastName("Downs"); + + createUserAndLogin(tenantAdmin, "testPassword1"); + } + + @After + public void afterTest() throws Exception { + loginSysAdmin(); + if (savedTenant != null) { + doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk()); + } + } + + @Test + public void testRuleChainWithOneRule() throws Exception { + // Creating Rule Chain + RuleChain ruleChain = new RuleChain(); + ruleChain.setName("Simple Rule Chain"); + ruleChain.setTenantId(savedTenant.getId()); + ruleChain.setRoot(true); + ruleChain.setDebugMode(true); + ruleChain = saveRuleChain(ruleChain); + Assert.assertNull(ruleChain.getFirstRuleNodeId()); + + RuleChainMetaData metaData = new RuleChainMetaData(); + metaData.setRuleChainId(ruleChain.getId()); + + RuleNode ruleNode = new RuleNode(); + ruleNode.setName("Simple Rule Node"); + ruleNode.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName()); + ruleNode.setDebugMode(true); + TbGetAttributesNodeConfiguration configuration = new TbGetAttributesNodeConfiguration(); + configuration.setServerAttributeNames(Collections.singletonList("serverAttributeKey")); + ruleNode.setConfiguration(mapper.valueToTree(configuration)); + + metaData.setNodes(Collections.singletonList(ruleNode)); + metaData.setFirstNodeIndex(0); + + metaData = saveRuleChainMetaData(metaData); + Assert.assertNotNull(metaData); + + ruleChain = getRuleChain(ruleChain.getId()); + Assert.assertNotNull(ruleChain.getFirstRuleNodeId()); + + // Saving the device + Device device = new Device(); + device.setName("My device"); + device.setType("default"); + device = doPost("/api/device", device, Device.class); + + attributesService.save(device.getId(), DataConstants.SERVER_SCOPE, + Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey", "serverAttributeValue"), System.currentTimeMillis()))); + + Thread.sleep(1000); + + // Pushing Message to the system + TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), + "CUSTOM", + device.getId(), + new TbMsgMetaData(), + new byte[]{}); + actorService.onMsg(new ServiceToRuleEngineMsg(savedTenant.getId(), tbMsg)); + + Thread.sleep(3000); + + TimePageData events = getDebugEvents(savedTenant.getId(), ruleChain.getFirstRuleNodeId(), 1000); + + Assert.assertEquals(2, events.getData().size()); + + Event inEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.IN)).findFirst().get(); + Assert.assertEquals(ruleChain.getFirstRuleNodeId(), inEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), inEvent.getBody().get("entityId").asText()); + + Event outEvent = events.getData().stream().filter(e -> e.getBody().get("type").asText().equals(DataConstants.OUT)).findFirst().get(); + Assert.assertEquals(ruleChain.getFirstRuleNodeId(), outEvent.getEntityId()); + Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); + + Assert.assertEquals("serverAttributeValue", outEvent.getBody().get("metadata").get("ss.serverAttributeKey").asText()); + } + +} diff --git a/application/src/test/java/org/thingsboard/server/rules/lifecycle/RuleEngineLifecycleSqlIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/lifecycle/RuleEngineLifecycleSqlIntegrationTest.java new file mode 100644 index 0000000000..004958b2ea --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/rules/lifecycle/RuleEngineLifecycleSqlIntegrationTest.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2018 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.rules.lifecycle; + +import org.thingsboard.server.dao.service.DaoSqlTest; +import org.thingsboard.server.rules.flow.AbstractRuleEngineFlowIntegrationTest; + +/** + * Created by Valerii Sosliuk on 8/22/2017. + */ +@DaoSqlTest +public class RuleEngineLifecycleSqlIntegrationTest extends AbstractRuleEngineLifecycleIntegrationTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java similarity index 71% rename from dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java rename to common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java index da3d4a0b7b..0c9fd5feb5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java @@ -13,11 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.service.rule.sql; +package org.thingsboard.server.common.data.rule; -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; +import lombok.Data; -@DaoSqlTest -public class RuleServiceSqlTest extends BaseRuleServiceTest { +/** + * Created by ashvayka on 21.03.18. + */ +@Data +public class NodeConnectionInfo { + private int fromIndex; + private int toIndex; + private String type; } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java similarity index 66% rename from dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java rename to common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java index 7ff9066499..35cf6aadad 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java @@ -13,11 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.service.rule.nosql; +package org.thingsboard.server.common.data.rule; -import org.thingsboard.server.dao.service.DaoNoSqlTest; -import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleChainId; -@DaoNoSqlTest -public class RuleServiceNoSqlTest extends BaseRuleServiceTest { +/** + * Created by ashvayka on 21.03.18. + */ +@Data +public class RuleChainConnectionInfo { + private int fromIndex; + private RuleChainId targetRuleChainId; + private String type; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java index af141d6142..1be1518637 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java @@ -58,18 +58,4 @@ public class RuleChainMetaData { ruleChainConnections.add(connectionInfo); } - @Data - public class NodeConnectionInfo { - private int fromIndex; - private int toIndex; - private String type; - } - - @Data - public class RuleChainConnectionInfo { - private int fromIndex; - private RuleChainId targetRuleChainId; - private String type; - } - } diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 3daed33045..7d6cd0032e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -31,7 +31,9 @@ import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.common.data.rule.NodeConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.dao.entity.AbstractEntityService; @@ -148,7 +150,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC ruleChainDao.save(ruleChain); } if (ruleChainMetaData.getConnections() != null) { - for (RuleChainMetaData.NodeConnectionInfo nodeConnection : ruleChainMetaData.getConnections()) { + for (NodeConnectionInfo nodeConnection : ruleChainMetaData.getConnections()) { EntityId from = nodes.get(nodeConnection.getFromIndex()).getId(); EntityId to = nodes.get(nodeConnection.getToIndex()).getId(); String type = nodeConnection.getType(); @@ -161,7 +163,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC } } if (ruleChainMetaData.getRuleChainConnections() != null) { - for (RuleChainMetaData.RuleChainConnectionInfo nodeToRuleChainConnection : ruleChainMetaData.getRuleChainConnections()) { + for (RuleChainConnectionInfo nodeToRuleChainConnection : ruleChainMetaData.getRuleChainConnections()) { EntityId from = nodes.get(nodeToRuleChainConnection.getFromIndex()).getId(); EntityId to = nodeToRuleChainConnection.getTargetRuleChainId(); String type = nodeToRuleChainConnection.getType(); @@ -314,7 +316,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC private void createRelation(EntityRelation relation) throws ExecutionException, InterruptedException { log.debug("Creating relation: {}", relation); - relationService.saveRelationAsync(relation).get(); + relationService.saveRelation(relation); } private DataValidator ruleChainValidator = diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java deleted file mode 100644 index b6139df898..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - * Copyright © 2016-2018 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.dao.service.rule; - -import com.datastax.driver.core.utils.UUIDs; -import org.junit.Assert; -import org.junit.Test; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.page.TextPageData; -import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.service.AbstractServiceTest; - -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; - -public abstract class BaseRuleServiceTest extends AbstractServiceTest { - - @Test - public void saveRule() throws Exception { - PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(plugin); - RuleMetaData ruleMetaData = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken())); - Assert.assertNotNull(ruleMetaData.getId()); - Assert.assertNotNull(ruleMetaData.getAdditionalInfo()); - ruleMetaData.setAdditionalInfo(mapper.readTree("{\"description\":\"test\"}")); - RuleMetaData newRuleMetaData = ruleService.saveRule(ruleMetaData); - Assert.assertEquals(ruleMetaData.getAdditionalInfo(), newRuleMetaData.getAdditionalInfo()); - } - - @Test - public void findRuleById() throws Exception { - PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(plugin); - - RuleMetaData expected = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken())); - Assert.assertNotNull(expected.getId()); - RuleMetaData found = ruleService.findRuleById(expected.getId()); - Assert.assertEquals(expected, found); - } - - @Test - public void findPluginRules() throws Exception { - TenantId tenantIdA = new TenantId(UUIDs.timeBased()); - TenantId tenantIdB = new TenantId(UUIDs.timeBased()); - - PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(pluginA); - pluginService.savePlugin(pluginB); - - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - - List foundA = ruleService.findPluginRules(pluginA.getApiToken()); - Assert.assertEquals(3, foundA.size()); - - List foundB = ruleService.findPluginRules(pluginB.getApiToken()); - Assert.assertEquals(2, foundB.size()); - } - - @Test - public void findSystemRules() throws Exception { - TenantId systemTenant = new TenantId(ModelConstants.NULL_UUID); // system tenant id - - PluginMetaData plugin = generatePlugin(systemTenant, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(plugin); - ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken())); - ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken())); - ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken())); - TextPageData found = ruleService.findSystemRules(new TextPageLink(100)); - Assert.assertEquals(3, found.getData().size()); - } - - @Test - public void findTenantRules() throws Exception { - TenantId tenantIdA = new TenantId(UUIDs.timeBased()); - TenantId tenantIdB = new TenantId(UUIDs.timeBased()); - - PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(pluginA); - pluginService.savePlugin(pluginB); - - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - - TextPageData foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100)); - Assert.assertEquals(3, foundA.getData().size()); - - TextPageData foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100)); - Assert.assertEquals(2, foundB.getData().size()); - } - - @Test - public void deleteRuleById() throws Exception { - PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(plugin); - - RuleMetaData expected = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken())); - Assert.assertNotNull(expected.getId()); - RuleMetaData found = ruleService.findRuleById(expected.getId()); - Assert.assertEquals(expected, found); - ruleService.deleteRuleById(expected.getId()); - found = ruleService.findRuleById(expected.getId()); - Assert.assertNull(found); - } - - @Test - public void deleteRulesByTenantId() throws Exception { - TenantId tenantIdA = new TenantId(UUIDs.timeBased()); - TenantId tenantIdB = new TenantId(UUIDs.timeBased()); - - PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt()); - pluginService.savePlugin(pluginA); - pluginService.savePlugin(pluginB); - - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken())); - - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken())); - - TextPageData foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100)); - Assert.assertEquals(3, foundA.getData().size()); - - TextPageData foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100)); - Assert.assertEquals(2, foundB.getData().size()); - - ruleService.deleteRulesByTenantId(tenantIdA); - - foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100)); - Assert.assertEquals(0, foundA.getData().size()); - - foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100)); - Assert.assertEquals(2, foundB.getData().size()); - } -} \ No newline at end of file From 6ece02f88f864f5a9551b870b3f40e8a33eb20c8 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 21 Mar 2018 14:56:16 +0200 Subject: [PATCH 18/75] Rule chains UI --- .../common/data/rule/RuleChainMetaData.java | 9 +- .../server/dao/rule/BaseRuleChainService.java | 4 +- ui/package.json | 1 + ui/src/app/api/entity.service.js | 8 +- ui/src/app/api/rule-chain.service.js | 137 +++- ui/src/app/app.js | 3 + ui/src/app/common/types.constant.js | 38 ++ .../entity/entity-autocomplete.directive.js | 6 + ui/src/app/locale/locale.constant.js | 20 + ui/src/app/rulechain/add-link.tpl.html | 48 ++ ui/src/app/rulechain/add-rulenode.tpl.html | 48 ++ ui/src/app/rulechain/index.js | 10 +- ui/src/app/rulechain/link-fieldset.tpl.html | 39 ++ ui/src/app/rulechain/link.directive.js | 71 ++ .../app/rulechain/rulechain-fieldset.tpl.html | 2 +- ui/src/app/rulechain/rulechain.controller.js | 638 +++++++++++++++--- ui/src/app/rulechain/rulechain.routes.js | 41 +- ui/src/app/rulechain/rulechain.scss | 262 +++++++ ui/src/app/rulechain/rulechain.tpl.html | 130 ++++ ui/src/app/rulechain/rulechains.controller.js | 188 ++++++ .../app/rulechain/rulenode-fieldset.tpl.html | 55 ++ ui/src/app/rulechain/rulenode.directive.js | 79 +++ ui/src/app/rulechain/rulenode.tpl.html | 45 ++ 23 files changed, 1761 insertions(+), 121 deletions(-) create mode 100644 ui/src/app/rulechain/add-link.tpl.html create mode 100644 ui/src/app/rulechain/add-rulenode.tpl.html create mode 100644 ui/src/app/rulechain/link-fieldset.tpl.html create mode 100644 ui/src/app/rulechain/link.directive.js create mode 100644 ui/src/app/rulechain/rulechain.scss create mode 100644 ui/src/app/rulechain/rulechain.tpl.html create mode 100644 ui/src/app/rulechain/rulechains.controller.js create mode 100644 ui/src/app/rulechain/rulenode-fieldset.tpl.html create mode 100644 ui/src/app/rulechain/rulenode.directive.js create mode 100644 ui/src/app/rulechain/rulenode.tpl.html diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java index af141d6142..8deece2237 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.common.data.rule; +import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; import org.thingsboard.server.common.data.id.RuleChainId; @@ -47,11 +48,12 @@ public class RuleChainMetaData { } connections.add(connectionInfo); } - public void addRuleChainConnectionInfo(int fromIndex, RuleChainId targetRuleChainId, String type) { + public void addRuleChainConnectionInfo(int fromIndex, RuleChainId targetRuleChainId, String type, JsonNode additionalInfo) { RuleChainConnectionInfo connectionInfo = new RuleChainConnectionInfo(); connectionInfo.setFromIndex(fromIndex); connectionInfo.setTargetRuleChainId(targetRuleChainId); connectionInfo.setType(type); + connectionInfo.setAdditionalInfo(additionalInfo); if (ruleChainConnections == null) { ruleChainConnections = new ArrayList<>(); } @@ -59,16 +61,17 @@ public class RuleChainMetaData { } @Data - public class NodeConnectionInfo { + public static class NodeConnectionInfo { private int fromIndex; private int toIndex; private String type; } @Data - public class RuleChainConnectionInfo { + public static class RuleChainConnectionInfo { private int fromIndex; private RuleChainId targetRuleChainId; + private JsonNode additionalInfo; private String type; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 04207ec2f5..c8c8df7641 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -166,7 +166,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC EntityId to = nodeToRuleChainConnection.getTargetRuleChainId(); String type = nodeToRuleChainConnection.getType(); try { - createRelation(new EntityRelation(from, to, type, RelationTypeGroup.RULE_NODE)); + createRelation(new EntityRelation(from, to, type, RelationTypeGroup.RULE_NODE, nodeToRuleChainConnection.getAdditionalInfo())); } catch (ExecutionException | InterruptedException e) { log.warn("[{}] Failed to create rule node to rule chain relation. from: [{}], to: [{}]", from, to); throw new RuntimeException(e); @@ -206,7 +206,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC ruleChainMetaData.addConnectionInfo(fromIndex, toIndex, type); } else if (nodeRelation.getTo().getEntityType() == EntityType.RULE_CHAIN) { RuleChainId targetRuleChainId = new RuleChainId(nodeRelation.getTo().getId()); - ruleChainMetaData.addRuleChainConnectionInfo(fromIndex, targetRuleChainId, type); + ruleChainMetaData.addRuleChainConnectionInfo(fromIndex, targetRuleChainId, type, nodeRelation.getAdditionalInfo()); } } } diff --git a/ui/package.json b/ui/package.json index ad95ef4a7a..b602720a48 100644 --- a/ui/package.json +++ b/ui/package.json @@ -69,6 +69,7 @@ "moment": "^2.15.0", "ngclipboard": "^1.1.1", "ngreact": "^0.3.0", + "ngFlowchart": "git://github.com/ikulikov/ngFlowchart.git#master", "objectpath": "^1.2.1", "oclazyload": "^1.0.9", "raphael": "^2.2.7", diff --git a/ui/src/app/api/entity.service.js b/ui/src/app/api/entity.service.js index e4c51a2ea9..ba1265f100 100644 --- a/ui/src/app/api/entity.service.js +++ b/ui/src/app/api/entity.service.js @@ -22,7 +22,7 @@ export default angular.module('thingsboard.api.entity', [thingsboardTypes]) /*@ngInject*/ function EntityService($http, $q, $filter, $translate, $log, userService, deviceService, assetService, tenantService, customerService, - ruleService, pluginService, dashboardService, entityRelationService, attributeService, types, utils) { + ruleService, pluginService, ruleChainService, dashboardService, entityRelationService, attributeService, types, utils) { var service = { getEntity: getEntity, getEntities: getEntities, @@ -73,6 +73,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device case types.entityType.user: promise = userService.getUser(entityId, true, config); break; + case types.entityType.rulechain: + promise = ruleChainService.getRuleChain(entityId, config); + break; case types.entityType.alarm: $log.error('Get Alarm Entity is not implemented!'); break; @@ -271,6 +274,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device case types.entityType.plugin: promise = pluginService.getAllPlugins(pageLink, config); break; + case types.entityType.rulechain: + promise = ruleChainService.getRuleChains(pageLink, config); + break; case types.entityType.dashboard: if (user.authority === 'CUSTOMER_USER') { promise = dashboardService.getCustomerDashboards(customerId, pageLink, config); diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index 16afa747b8..be8e99db11 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -17,7 +17,9 @@ export default angular.module('thingsboard.api.ruleChain', []) .factory('ruleChainService', RuleChainService).name; /*@ngInject*/ -function RuleChainService($http, $q) { +function RuleChainService($http, $q, $filter, types) { + + var ruleNodeTypes = null; var service = { getSystemRuleChains: getSystemRuleChains, @@ -27,7 +29,11 @@ function RuleChainService($http, $q) { saveRuleChain: saveRuleChain, deleteRuleChain: deleteRuleChain, getRuleChainMetaData: getRuleChainMetaData, - saveRuleChainMetaData: saveRuleChainMetaData + saveRuleChainMetaData: saveRuleChainMetaData, + getRuleNodeTypes: getRuleNodeTypes, + getRuleNodeComponentType: getRuleNodeComponentType, + getRuleNodeSupportedLinks: getRuleNodeSupportedLinks, + resolveTargetRuleChains: resolveTargetRuleChains }; return service; @@ -147,4 +153,131 @@ function RuleChainService($http, $q) { return deferred.promise; } + function getRuleNodeSupportedLinks(nodeType) { //eslint-disable-line + //TODO: + var deferred = $q.defer(); + var linkLabels = [ + { name: 'Success', custom: false }, + { name: 'Fail', custom: false }, + { name: 'Custom', custom: true }, + ]; + deferred.resolve(linkLabels); + return deferred.promise; + } + + function getRuleNodeTypes() { + var deferred = $q.defer(); + if (ruleNodeTypes) { + deferred.resolve(ruleNodeTypes); + } else { + loadRuleNodeTypes().then( + (nodeTypes) => { + ruleNodeTypes = nodeTypes; + ruleNodeTypes.push( + { + nodeType: types.ruleNodeType.RULE_CHAIN.value, + type: 'Rule chain' + } + ); + deferred.resolve(ruleNodeTypes); + }, + () => { + deferred.reject(); + } + ); + } + return deferred.promise; + } + + function getRuleNodeComponentType(type) { + var res = $filter('filter')(ruleNodeTypes, {type: type}, true); + if (res && res.length) { + return res[0].nodeType; + } + return null; + } + + function resolveTargetRuleChains(ruleChainConnections) { + var deferred = $q.defer(); + if (ruleChainConnections && ruleChainConnections.length) { + var tasks = []; + for (var i = 0; i < ruleChainConnections.length; i++) { + tasks.push(getRuleChain(ruleChainConnections[i].targetRuleChainId.id)); + } + $q.all(tasks).then( + (ruleChains) => { + var ruleChainsMap = {}; + for (var i = 0; i < ruleChains.length; i++) { + ruleChainsMap[ruleChains[i].id.id] = ruleChains[i]; + } + deferred.resolve(ruleChainsMap); + }, + () => { + deferred.reject(); + } + ); + } else { + deferred.resolve({}); + } + return deferred.promise; + } + + function loadRuleNodeTypes() { + var deferred = $q.defer(); + deferred.resolve( + [ + { + nodeType: types.ruleNodeType.FILTER.value, + type: 'Filter' + }, + { + nodeType: types.ruleNodeType.FILTER.value, + type: 'Switch' + }, + { + nodeType: types.ruleNodeType.ENRICHMENT.value, + type: 'Self' + }, + { + nodeType: types.ruleNodeType.ENRICHMENT.value, + type: 'Tenant/Customer' + }, + { + nodeType: types.ruleNodeType.ENRICHMENT.value, + type: 'Related Entity' + }, + { + nodeType: types.ruleNodeType.ENRICHMENT.value, + type: 'Last Telemetry' + }, + { + nodeType: types.ruleNodeType.TRANSFORMATION.value, + type: 'Modify' + }, + { + nodeType: types.ruleNodeType.TRANSFORMATION.value, + type: 'New/Update' + }, + { + nodeType: types.ruleNodeType.ACTION.value, + type: 'Telemetry' + }, + { + nodeType: types.ruleNodeType.ACTION.value, + type: 'RPC call' + }, + { + nodeType: types.ruleNodeType.ACTION.value, + type: 'Send email' + }, + { + nodeType: types.ruleNodeType.ACTION.value, + type: 'Alarm' + } + ] + ); + return deferred.promise; + } + + } diff --git a/ui/src/app/app.js b/ui/src/app/app.js index 138b2308f3..31310135cd 100644 --- a/ui/src/app/app.js +++ b/ui/src/app/app.js @@ -49,6 +49,7 @@ import 'material-ui'; import 'react-schema-form'; import react from 'ngreact'; import '@flowjs/ng-flow/dist/ng-flow-standalone.min'; +import 'ngFlowchart/dist/ngFlowchart'; import thingsboardLocales from './locale/locale.constant'; import thingsboardLogin from './login'; @@ -86,6 +87,7 @@ import 'mdPickers/dist/mdPickers.min.css'; import 'angular-hotkeys/build/hotkeys.min.css'; import 'angular-carousel/dist/angular-carousel.min.css'; import 'angular-material-expansion-panel/dist/md-expansion-panel.min.css'; +import 'ngFlowchart/dist/flowchart.css'; import '../scss/main.scss'; import AppConfig from './app.config'; @@ -113,6 +115,7 @@ angular.module('thingsboard', [ 'ngclipboard', react.name, 'flow', + 'flowchart', thingsboardLocales, thingsboardLogin, thingsboardDialogs, diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 77c21e1fd0..b134bf0575 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -457,6 +457,44 @@ export default angular.module('thingsboard.types', []) clientSide: false } }, + ruleNodeType: { + FILTER: { + value: "FILTER", + name: "rulenode.type-filter", + nodeClass: "tb-filter-type", + icon: "filter_list" + }, + ENRICHMENT: { + value: "ENRICHMENT", + name: "rulenode.type-enrichment", + nodeClass: "tb-enrichment-type", + icon: "playlist_add" + }, + TRANSFORMATION: { + value: "TRANSFORMATION", + name: "rulenode.type-transformation", + nodeClass: "tb-transformation-type", + icon: "transform" + }, + ACTION: { + value: "ACTION", + name: "rulenode.type-action", + nodeClass: "tb-action-type", + icon: "flash_on" + }, + RULE_CHAIN: { + value: "RULE_CHAIN", + name: "rulenode.type-rule-chain", + nodeClass: "tb-rule-chain-type", + icon: "settings_ethernet" + }, + INPUT: { + value: "INPUT", + nodeClass: "tb-input-type", + icon: "input", + special: true + } + }, valueType: { string: { value: "string", diff --git a/ui/src/app/entity/entity-autocomplete.directive.js b/ui/src/app/entity/entity-autocomplete.directive.js index c2053c0bcc..2dfc3be28f 100644 --- a/ui/src/app/entity/entity-autocomplete.directive.js +++ b/ui/src/app/entity/entity-autocomplete.directive.js @@ -143,6 +143,12 @@ export default function EntityAutocomplete($compile, $templateCache, $q, $filter scope.noEntitiesMatchingText = 'plugin.no-plugins-matching'; scope.entityRequiredText = 'plugin.plugin-required'; break; + case types.entityType.rulechain: + scope.selectEntityText = 'rulechain.select-rulechain'; + scope.entityText = 'rulechain.rulechain'; + scope.noEntitiesMatchingText = 'rulechain.no-rulechains-matching'; + scope.entityRequiredText = 'rulechain.rulechain-required'; + break; case types.entityType.tenant: scope.selectEntityText = 'tenant.select-tenant'; scope.entityText = 'tenant.tenant'; diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index ea576ecf51..4c392ca84d 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1169,6 +1169,26 @@ export default angular.module('thingsboard.locale', []) "rulechain-required": "Rule chain is required", "management": "Rules management" }, + "rulenode": { + "add": "Add rule node", + "name": "Name", + "name-required": "Name is required.", + "type": "Type", + "description": "Description", + "delete": "Delete rule node", + "rulenode-details": "Rule node details", + "link-details": "Rule node link details", + "add-link": "Add link", + "link-label": "Link label", + "link-label-required": "Link label is required.", + "custom-link-label": "Custom link label", + "custom-link-label-required": "Custom link label is required.", + "type-filter": "Filter", + "type-enrichment": "Enrichment", + "type-transformation": "Transformation", + "type-action": "Action", + "type-rule-chain": "Rule Chain" + }, "rule-plugin": { "management": "Rules and plugins management" }, diff --git a/ui/src/app/rulechain/add-link.tpl.html b/ui/src/app/rulechain/add-link.tpl.html new file mode 100644 index 0000000000..42c07773bb --- /dev/null +++ b/ui/src/app/rulechain/add-link.tpl.html @@ -0,0 +1,48 @@ + + +

+ +
+

rulenode.add-link

+ +
+ + + +
+ + + + +
+ +
+ + + + + {{ 'action.add' | translate }} + + {{ 'action.cancel' | + translate }} + + + + diff --git a/ui/src/app/rulechain/add-rulenode.tpl.html b/ui/src/app/rulechain/add-rulenode.tpl.html new file mode 100644 index 0000000000..c36b43bc0f --- /dev/null +++ b/ui/src/app/rulechain/add-rulenode.tpl.html @@ -0,0 +1,48 @@ + + +
+ +
+

rulenode.add

+ +
+ + + +
+ + + + +
+ +
+ + + + + {{ 'action.add' | translate }} + + {{ 'action.cancel' | + translate }} + + +
+ diff --git a/ui/src/app/rulechain/index.js b/ui/src/app/rulechain/index.js index faecc03e03..7306762572 100644 --- a/ui/src/app/rulechain/index.js +++ b/ui/src/app/rulechain/index.js @@ -15,11 +15,19 @@ */ import RuleChainRoutes from './rulechain.routes'; -import RuleChainController from './rulechain.controller'; +import RuleChainsController from './rulechains.controller'; +import {RuleChainController, AddRuleNodeController, AddRuleNodeLinkController} from './rulechain.controller'; import RuleChainDirective from './rulechain.directive'; +import RuleNodeDirective from './rulenode.directive'; +import LinkDirective from './link.directive'; export default angular.module('thingsboard.ruleChain', []) .config(RuleChainRoutes) + .controller('RuleChainsController', RuleChainsController) .controller('RuleChainController', RuleChainController) + .controller('AddRuleNodeController', AddRuleNodeController) + .controller('AddRuleNodeLinkController', AddRuleNodeLinkController) .directive('tbRuleChain', RuleChainDirective) + .directive('tbRuleNode', RuleNodeDirective) + .directive('tbRuleNodeLink', LinkDirective) .name; diff --git a/ui/src/app/rulechain/link-fieldset.tpl.html b/ui/src/app/rulechain/link-fieldset.tpl.html new file mode 100644 index 0000000000..13ec6c3ce8 --- /dev/null +++ b/ui/src/app/rulechain/link-fieldset.tpl.html @@ -0,0 +1,39 @@ + + +
+ + + + + {{label.name}} + + +
+
rulenode.link-label-required
+
+ + + + +
+
rulenode.custom-link-label-required
+
+ +
+ diff --git a/ui/src/app/rulechain/link.directive.js b/ui/src/app/rulechain/link.directive.js new file mode 100644 index 0000000000..b3565a3954 --- /dev/null +++ b/ui/src/app/rulechain/link.directive.js @@ -0,0 +1,71 @@ +/* + * Copyright © 2016-2018 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. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import linkFieldsetTemplate from './link-fieldset.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function LinkDirective($compile, $templateCache, $filter) { + var linker = function (scope, element) { + var template = $templateCache.get(linkFieldsetTemplate); + element.html(template); + + scope.selectedLabel = null; + + scope.$watch('link', function() { + scope.selectedLabel = null; + if (scope.link && scope.labels) { + if (scope.link.label) { + var result = $filter('filter')(scope.labels, {name: scope.link.label}); + if (result && result.length) { + scope.selectedLabel = result[0]; + } else { + result = $filter('filter')(scope.labels, {custom: true}); + if (result && result.length && result[0].custom) { + scope.selectedLabel = result[0]; + } + } + } + } + }); + + scope.selectedLabelChanged = function() { + if (scope.link && scope.selectedLabel) { + if (!scope.selectedLabel.custom) { + scope.link.label = scope.selectedLabel.name; + } else { + scope.link.label = ""; + } + } + }; + + $compile(element.contents())(scope); + } + return { + restrict: "E", + link: linker, + scope: { + link: '=', + labels: '=', + isEdit: '=', + isReadOnly: '=', + theForm: '=' + } + }; +} diff --git a/ui/src/app/rulechain/rulechain-fieldset.tpl.html b/ui/src/app/rulechain/rulechain-fieldset.tpl.html index ec68c574bf..a79ba35cf0 100644 --- a/ui/src/app/rulechain/rulechain-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulechain-fieldset.tpl.html @@ -32,7 +32,7 @@
- +
diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 475ef4e09a..c854cfa36d 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -13,160 +13,582 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import './rulechain.scss'; + /* eslint-disable import/no-unresolved, import/default */ -import addRuleChainTemplate from './add-rulechain.tpl.html'; -import ruleChainCard from './rulechain-card.tpl.html'; +import addRuleNodeTemplate from './add-rulenode.tpl.html'; +import addRuleNodeLinkTemplate from './add-link.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ + +const deleteKeyCode = 46; +const ctrlKeyCode = 17; +const aKeyCode = 65; +const escKeyCode = 27; + /*@ngInject*/ -export default function RuleChainController(ruleChainService, userService, importExport, $state, $stateParams, $filter, $translate, types) { - - var ruleChainActionsList = [ - { - onAction: function ($event, item) { - exportRuleChain($event, item); - }, - name: function() { $translate.instant('action.export') }, - details: function() { return $translate.instant('rulechain.export') }, - icon: "file_download" - }, - { - onAction: function ($event, item) { - vm.grid.deleteItem($event, item); - }, - name: function() { return $translate.instant('action.delete') }, - details: function() { return $translate.instant('rulechain.delete') }, - icon: "delete", - isEnabled: isRuleChainEditable - } - ]; - - var ruleChainAddItemActionsList = [ - { - onAction: function ($event) { - vm.grid.addItem($event); - }, - name: function() { return $translate.instant('action.create') }, - details: function() { return $translate.instant('rulechain.create-new-rulechain') }, - icon: "insert_drive_file" - }, - { - onAction: function ($event) { - importExport.importRuleChain($event).then( - function() { - vm.grid.refreshList(); - } - ); - }, - name: function() { return $translate.instant('action.import') }, - details: function() { return $translate.instant('rulechain.import') }, - icon: "file_upload" - } - ]; +export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpansionPanel, $document, $mdDialog, $filter, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { var vm = this; + vm.$mdExpansionPanel = $mdExpansionPanel; vm.types = types; - vm.ruleChainGridConfig = { + vm.editingRuleNode = null; + vm.isEditingRuleNode = false; + + vm.editingRuleNodeLink = null; + vm.isEditingRuleNodeLink = false; - refreshParamsFunc: null, + vm.ruleChain = ruleChain; + vm.ruleChainMetaData = ruleChainMetaData; - deleteItemTitleFunc: deleteRuleChainTitle, - deleteItemContentFunc: deleteRuleChainText, - deleteItemsTitleFunc: deleteRuleChainsTitle, - deleteItemsActionTitleFunc: deleteRuleChainsActionTitle, - deleteItemsContentFunc: deleteRuleChainsText, + vm.canvasControl = {}; - fetchItemsFunc: fetchRuleChains, - saveItemFunc: saveRuleChain, - deleteItemFunc: deleteRuleChain, + vm.ruleChainModel = { + nodes: [], + edges: [] + }; + + vm.ruleNodeTypesModel = {}; + for (var type in types.ruleNodeType) { + if (!types.ruleNodeType[type].special) { + vm.ruleNodeTypesModel[type] = { + model: { + nodes: [], + edges: [] + }, + selectedObjects: [] + }; + } + } - getItemTitleFunc: getRuleChainTitle, - itemCardTemplateUrl: ruleChainCard, - parentCtl: vm, + vm.selectedObjects = []; - actionsList: ruleChainActionsList, - addItemActions: ruleChainAddItemActionsList, + vm.modelservice = Modelfactory(vm.ruleChainModel, vm.selectedObjects); - onGridInited: gridInited, + vm.ctrlDown = false; - addItemTemplateUrl: addRuleChainTemplate, + vm.saveRuleChain = saveRuleChain; + vm.revertRuleChain = revertRuleChain; - addItemText: function() { return $translate.instant('rulechain.add-rulechain-text') }, - noItemsText: function() { return $translate.instant('rulechain.no-rulechains-text') }, - itemDetailsText: function() { return $translate.instant('rulechain.rulechain-details') }, - isSelectionEnabled: isRuleChainEditable, - isDetailsReadOnly: function(ruleChain) { - return !isRuleChainEditable(ruleChain); + vm.keyDown = function (evt) { + if (evt.keyCode === ctrlKeyCode) { + vm.ctrlDown = true; + evt.stopPropagation(); + evt.preventDefault(); } }; - if (angular.isDefined($stateParams.items) && $stateParams.items !== null) { - vm.ruleChainGridConfig.items = $stateParams.items; - } + vm.keyUp = function (evt) { - if (angular.isDefined($stateParams.topIndex) && $stateParams.topIndex > 0) { - vm.ruleChainGridConfig.topIndex = $stateParams.topIndex; - } + if (evt.keyCode === deleteKeyCode) { + vm.modelservice.deleteSelected(); + } - vm.isRuleChainEditable = isRuleChainEditable; + if (evt.keyCode == aKeyCode && vm.ctrlDown) { + vm.modelservice.selectAll(); + } - vm.exportRuleChain = exportRuleChain; + if (evt.keyCode == escKeyCode) { + vm.modelservice.deselectAll(); + } - function deleteRuleChainTitle(ruleChain) { - return $translate.instant('rulechain.delete-rulechain-title', {ruleChainName: ruleChain.name}); - } + if (evt.keyCode === ctrlKeyCode) { + vm.ctrlDown = false; + evt.stopPropagation(); + evt.preventDefault(); + } + }; - function deleteRuleChainText() { - return $translate.instant('rulechain.delete-rulechain-text'); - } + vm.onEditRuleNodeClosed = function() { + vm.editingRuleNode = null; + }; + + vm.onEditRuleNodeLinkClosed = function() { + vm.editingRuleNodeLink = null; + }; + + vm.saveRuleNode = function(theForm) { + theForm.$setPristine(); + vm.isEditingRuleNode = false; + vm.ruleChainModel.nodes[vm.editingRuleNodeIndex] = vm.editingRuleNode; + vm.editingRuleNode = angular.copy(vm.editingRuleNode); + }; + + vm.saveRuleNodeLink = function(theForm) { + theForm.$setPristine(); + vm.isEditingRuleNodeLink = false; + vm.ruleChainModel.edges[vm.editingRuleNodeLinkIndex] = vm.editingRuleNodeLink; + vm.editingRuleNodeLink = angular.copy(vm.editingRuleNodeLink); + }; + + vm.onRevertRuleNodeEdit = function(theForm) { + theForm.$setPristine(); + var node = vm.ruleChainModel.nodes[vm.editingRuleNodeIndex]; + vm.editingRuleNode = angular.copy(node); + }; + + vm.onRevertRuleNodeLinkEdit = function(theForm) { + theForm.$setPristine(); + var edge = vm.ruleChainModel.edges[vm.editingRuleNodeLinkIndex]; + vm.editingRuleNodeLink = angular.copy(edge); + }; + + vm.editCallbacks = { + edgeDoubleClick: function (event, edge) { + var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); + if (sourceNode.nodeType != types.ruleNodeType.INPUT.value) { + ruleChainService.getRuleNodeSupportedLinks(sourceNode.type).then( + (labels) => { + vm.isEditingRuleNode = false; + vm.editingRuleNode = null; + vm.editingRuleNodeLinkLabels = labels; + vm.isEditingRuleNodeLink = true; + vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); + vm.editingRuleNodeLink = angular.copy(edge); + } + ); + } + }, + nodeCallbacks: { + 'doubleClick': function (event, node) { + if (node.nodeType != types.ruleNodeType.INPUT.value) { + vm.isEditingRuleNodeLink = false; + vm.editingRuleNodeLink = null; + vm.isEditingRuleNode = true; + vm.editingRuleNodeIndex = vm.ruleChainModel.nodes.indexOf(node); + vm.editingRuleNode = angular.copy(node); + } + } + }, + isValidEdge: function (source, destination) { + return source.type === flowchartConstants.rightConnectorType && destination.type === flowchartConstants.leftConnectorType; + }, + createEdge: function (event, edge) { + var deferred = $q.defer(); + var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); + if (sourceNode.nodeType == types.ruleNodeType.INPUT.value) { + var destNode = vm.modelservice.nodes.getNodeByConnectorId(edge.destination); + if (destNode.nodeType == types.ruleNodeType.RULE_CHAIN.value) { + deferred.reject(); + } else { + var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}); + if (res && res.length) { + vm.modelservice.edges.delete(res[0]); + } + deferred.resolve(edge); + } + } else { + ruleChainService.getRuleNodeSupportedLinks(sourceNode.type).then( + (labels) => { + addRuleNodeLink(event, edge, labels).then( + (link) => { + deferred.resolve(link); + }, + () => { + deferred.reject(); + } + ); + }, + () => { + deferred.reject(); + } + ); + } + return deferred.promise; + }, + dropNode: function (event, node) { + addRuleNode(event, node); + } + }; - function deleteRuleChainsTitle(selectedCount) { - return $translate.instant('rulechain.delete-rulechains-title', {count: selectedCount}, 'messageformat'); + loadRuleChainLibrary(); + + function loadRuleChainLibrary() { + ruleChainService.getRuleNodeTypes().then( + (ruleNodeTypes) => { + for (var i=0;i { + createRuleChainModel(ruleChainsMap); + } + ); } - function deleteRuleChainsText() { - return $translate.instant('rulechain.delete-rulechains-text'); + function createRuleChainModel(ruleChainsMap) { + var nodes = []; + for (var i=0;i -1) { + var destNode = nodes[vm.ruleChainMetaData.firstNodeIndex]; + if (destNode) { + var connectors = vm.modelservice.nodes.getConnectorsByType(destNode, flowchartConstants.leftConnectorType); + if (connectors && connectors.length) { + var edge = { + source: vm.inputConnectorId, + destination: connectors[0].id + }; + vm.ruleChainModel.edges.push(edge); + } + } + } + + if (vm.ruleChainMetaData.connections) { + for (i = 0; i < vm.ruleChainMetaData.connections.length; i++) { + var connection = vm.ruleChainMetaData.connections[0]; + var sourceNode = nodes[connection.fromIndex]; + destNode = nodes[connection.toIndex]; + if (sourceNode && destNode) { + var sourceConnectors = vm.modelservice.nodes.getConnectorsByType(sourceNode, flowchartConstants.rightConnectorType); + var destConnectors = vm.modelservice.nodes.getConnectorsByType(destNode, flowchartConstants.leftConnectorType); + if (sourceConnectors && sourceConnectors.length && destConnectors && destConnectors.length) { + edge = { + source: sourceConnectors[0].id, + destination: destConnectors[0].id, + label: connection.type + }; + vm.ruleChainModel.edges.push(edge); + } + } + } + } + + if (vm.ruleChainMetaData.ruleChainConnections) { + var ruleChainNodesMap = {}; + for (i = 0; i < vm.ruleChainMetaData.ruleChainConnections.length; i++) { + var ruleChainConnection = vm.ruleChainMetaData.ruleChainConnections[i]; + var ruleChain = ruleChainsMap[ruleChainConnection.targetRuleChainId.id]; + if (ruleChainConnection.additionalInfo && ruleChainConnection.additionalInfo.ruleChainNodeId) { + var ruleChainNode = ruleChainNodesMap[ruleChainConnection.additionalInfo.ruleChainNodeId]; + if (!ruleChainNode) { + ruleChainNode = { + id: vm.nextNodeID++, + additionalInfo: ruleChainConnection.additionalInfo, + targetRuleChainId: ruleChainConnection.targetRuleChainId.id, + x: ruleChainConnection.additionalInfo.layoutX, + y: ruleChainConnection.additionalInfo.layoutY, + type: 'Rule chain', + name: ruleChain.name, + nodeType: vm.types.ruleNodeType.RULE_CHAIN.value, + nodeClass: vm.types.ruleNodeType.RULE_CHAIN.nodeClass, + icon: vm.types.ruleNodeType.RULE_CHAIN.icon, + connectors: [ + { + type: flowchartConstants.leftConnectorType, + id: vm.nextConnectorID++ + } + ] + }; + ruleChainNodesMap[ruleChainConnection.additionalInfo.ruleChainNodeId] = ruleChainNode; + vm.ruleChainModel.nodes.push(ruleChainNode); + } + sourceNode = nodes[ruleChainConnection.fromIndex]; + if (sourceNode) { + connectors = vm.modelservice.nodes.getConnectorsByType(sourceNode, flowchartConstants.rightConnectorType); + if (connectors && connectors.length) { + var ruleChainEdge = { + source: connectors[0].id, + destination: ruleChainNode.connectors[0].id, + label: ruleChainConnection.type + }; + vm.ruleChainModel.edges.push(ruleChainEdge); + } + } + } + } + } + + vm.canvasControl.adjustCanvasSize(); + + vm.isDirty = false; + + $mdUtil.nextTick(() => { + vm.ruleChainWatch = $scope.$watch('vm.ruleChainModel', + function (newVal, oldVal) { + if (!vm.isDirty && !angular.equals(newVal, oldVal)) { + vm.isDirty = true; + } + }, true + ); + }); } - function gridInited(grid) { - vm.grid = grid; + function saveRuleChain() { + var ruleChainMetaData = { + ruleChainId: vm.ruleChain.id, + nodes: [], + connections: [], + ruleChainConnections: [] + }; + + var nodes = []; + + for (var i=0;i { + vm.ruleChainMetaData = ruleChainMetaData; + prepareRuleChain(); + } + ); } - function fetchRuleChains(pageLink) { - return ruleChainService.getRuleChains(pageLink); + function revertRuleChain() { + prepareRuleChain(); } - function saveRuleChain(ruleChain) { - return ruleChainService.saveRuleChain(ruleChain); + function addRuleNode($event, ruleNode) { + $mdDialog.show({ + controller: 'AddRuleNodeController', + controllerAs: 'vm', + templateUrl: addRuleNodeTemplate, + parent: angular.element($document[0].body), + locals: {ruleNode: ruleNode, ruleChainId: vm.ruleChain.id.id}, + fullscreen: true, + targetEvent: $event + }).then(function (ruleNode) { + ruleNode.id = vm.nextNodeID++; + ruleNode.connectors = []; + ruleNode.connectors.push( + { + id: vm.nextConnectorID++, + type: flowchartConstants.leftConnectorType + } + ); + if (ruleNode.nodeType != types.ruleNodeType.RULE_CHAIN.value) { + ruleNode.connectors.push( + { + id: vm.nextConnectorID++, + type: flowchartConstants.rightConnectorType + } + ); + } + vm.ruleChainModel.nodes.push(ruleNode); + }, function () { + }); } - function deleteRuleChain(ruleChainId) { - return ruleChainService.deleteRuleChain(ruleChainId); + function addRuleNodeLink($event, link, labels) { + return $mdDialog.show({ + controller: 'AddRuleNodeLinkController', + controllerAs: 'vm', + templateUrl: addRuleNodeLinkTemplate, + parent: angular.element($document[0].body), + locals: {link: link, labels: labels}, + fullscreen: true, + targetEvent: $event + }); } - function getRuleChainTitle(ruleChain) { - return ruleChain ? ruleChain.name : ''; +} + +/*@ngInject*/ +export function AddRuleNodeController($scope, $mdDialog, ruleNode, ruleChainId, helpLinks) { + + var vm = this; + + vm.helpLinks = helpLinks; + vm.ruleNode = ruleNode; + vm.ruleChainId = ruleChainId; + + vm.add = add; + vm.cancel = cancel; + + function cancel() { + $mdDialog.cancel(); } - function isRuleChainEditable(ruleChain) { - if (userService.getAuthority() === 'TENANT_ADMIN') { - return ruleChain && ruleChain.tenantId.id != types.id.nullUid; - } else { - return userService.getAuthority() === 'SYS_ADMIN'; - } + function add() { + $scope.theForm.$setPristine(); + $mdDialog.hide(vm.ruleNode); } +} + +/*@ngInject*/ +export function AddRuleNodeLinkController($scope, $mdDialog, link, labels, helpLinks) { - function exportRuleChain($event, ruleChain) { - $event.stopPropagation(); - importExport.exportRuleChain(ruleChain.id.id); + var vm = this; + + vm.helpLinks = helpLinks; + vm.link = link; + vm.labels = labels; + + vm.add = add; + vm.cancel = cancel; + + function cancel() { + $mdDialog.cancel(); } + function add() { + $scope.theForm.$setPristine(); + $mdDialog.hide(vm.link); + } } diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js index e8d6be49d2..808661a65a 100644 --- a/ui/src/app/rulechain/rulechain.routes.js +++ b/ui/src/app/rulechain/rulechain.routes.js @@ -15,12 +15,16 @@ */ /* eslint-disable import/no-unresolved, import/default */ +import ruleNodeTemplate from './rulenode.tpl.html'; import ruleChainsTemplate from './rulechains.tpl.html'; +import ruleChainTemplate from './rulechain.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function RuleChainRoutes($stateProvider) { +export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider) { + + NodeTemplatePathProvider.setTemplatePath(ruleNodeTemplate); $stateProvider .state('home.ruleChains', { @@ -32,7 +36,7 @@ export default function RuleChainRoutes($stateProvider) { "content@home": { templateUrl: ruleChainsTemplate, controllerAs: 'vm', - controller: 'RuleChainController' + controller: 'RuleChainsController' } }, data: { @@ -42,5 +46,36 @@ export default function RuleChainRoutes($stateProvider) { ncyBreadcrumb: { label: '{"icon": "settings_ethernet", "label": "rulechain.rulechains"}' } - }); + }).state('home.ruleChains.ruleChain', { + url: '/:ruleChainId', + reloadOnSearch: false, + module: 'private', + auth: ['SYS_ADMIN', 'TENANT_ADMIN'], + views: { + "content@home": { + templateUrl: ruleChainTemplate, + controller: 'RuleChainController', + controllerAs: 'vm' + } + }, + resolve: { + ruleChain: + /*@ngInject*/ + function($stateParams, ruleChainService) { + return ruleChainService.getRuleChain($stateParams.ruleChainId); + }, + ruleChainMetaData: + /*@ngInject*/ + function($stateParams, ruleChainService) { + return ruleChainService.getRuleChainMetaData($stateParams.ruleChainId); + } + }, + data: { + searchEnabled: false, + pageTitle: 'rulechain.rulechain' + }, + ncyBreadcrumb: { + label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' + } + }); } diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss new file mode 100644 index 0000000000..258e232ea4 --- /dev/null +++ b/ui/src/app/rulechain/rulechain.scss @@ -0,0 +1,262 @@ +/** + * Copyright © 2016-2018 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. + */ + +.tb-rulechain { + .tb-fullscreen-button-style { + z-index: 1; + } + .tb-rulechain-library { + width: 250px; + min-width: 250px; + overflow-y: auto; + overflow-x: hidden; + + .tb-rulechain-library-panel-group { + .tb-panel-title { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + min-width: 180px; + } + .fc-canvas { + background: none; + } + md-icon.md-expansion-panel-icon { + margin-right: 0px; + } + md-expansion-panel-collapsed, .md-expansion-panel-header-container { + background: #e6e6e6; + border-color: #909090; + position: static; + } + md-expansion-panel { + &.md-open { + margin-top: 0; + margin-bottom: 0; + } + } + md-expansion-panel-content { + padding: 0px; + } + } + } + .tb-rulechain-graph { + overflow: auto; + } +} + +.fc-canvas { + min-width: 100%; + min-height: 100%; + outline: none; +} + +.tb-rule-node { + display: flex; + flex-direction: row; + min-width: 150px; + max-width: 150px; + min-height: 28px; + max-height: 28px; + padding: 5px 10px; + border-radius: 5px; + background-color: #F15B26; + color: #333; + border: solid 1px #777; + font-size: 12px; + &.tb-input-type { + background-color: #a3eaa9; + user-select: none; + } + &.tb-filter-type { + background-color: #f1e861; + } + &.tb-enrichment-type { + background-color: #cdf14e; + } + &.tb-transformation-type { + background-color: #79cef1; + } + &.tb-action-type { + background-color: #f1928f; + } + &.tb-rule-chain-type { + background-color: #d6c4f1; + } + md-icon { + font-size: 20px; + width: 20px; + height: 20px; + min-height: 20px; + min-width: 20px; + padding-right: 4px; + } + .tb-node-type { + + } + .tb-node-title { + font-weight: 600; + } + .tb-node-type, .tb-node-title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } +} + +.fc-node { + z-index: 1; + outline: none; + &.fc-hover, &.fc-selected { + -webkit-filter: brightness(70%); + filter: brightness(70%); + } + &.fc-dragging { + z-index: 10; + } + p { + padding: 0 15px; + text-align: center; + } +} + +.fc-leftConnectors, .fc-rightConnectors { + position: absolute; + top: 0; + height: 100%; + + display: flex; + flex-direction: column; + + z-index: 0; + .fc-magnet { + align-items: center; + } +} + +.fc-leftConnectors { + left: -20px; +} + +.fc-rightConnectors { + right: -20px; +} + +.fc-magnet { + display: flex; + flex-grow: 1; + height: 60px; + justify-content: center; +} + +.fc-connector { + width: 14px; + height: 14px; + border: 1px solid #333; + margin: 10px; + border-radius: 5px; + background-color: #ccc; +} + +.fc-connector.fc-hover { + background-color: #000; +} + +.fc-edge { + outline: none; + stroke: gray; + stroke-width: 4; + fill: transparent; + &.fc-selected { + stroke: red; + stroke-width: 4; + fill: transparent; + } + &.fc-active { + animation: dash 3s linear infinite; + stroke-dasharray: 20; + } + &.fc-hover { + stroke: gray; + stroke-width: 6; + fill: transparent; + } + &.fc-dragging { + pointer-events: none; + } +} + +.edge-endpoint { + fill: gray; +} + +.fc-nodedelete { + display: none; +} + +.fc-selected .fc-nodedelete { + outline: none; + display: block; + position: absolute; + right: -13px; + top: -16px; + border: solid 2px white; + border-radius: 50%; + font-weight: 600; + font-size: 18px; + line-height: 18px; + height: 20px; + padding-top: 2px; + width: 22px; + background: #494949; + color: #fff; + text-align: center; + vertical-align: bottom; + cursor: pointer; +} + +.fc-edge-label { + position: absolute; + user-select: none; + pointer-events: none; + opacity: 0.8; +} + +.fc-edge-label-text { + position: absolute; + left: 50%; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + white-space: nowrap; + text-align: center; + font-size: 14px; + font-weight: 600; + top: 5px; + span { + border: solid 2px #003a79; + border-radius: 10px; + color: #003a79; + background-color: #fff; + padding: 3px 5px; + } +} + +@keyframes dash { + from { + stroke-dashoffset: 500; + } +} diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html new file mode 100644 index 0000000000..9f22ebceb9 --- /dev/null +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -0,0 +1,130 @@ + + + +
+
+
+ + + +
{{vm.types.ruleNodeType[typeId].name}}
+ + + + +
{{vm.types.ruleNodeType[typeId].name}}
+ + + + + + + + +
+
+ + +
+
+ + +
+ +
+ + +
+ + + + + +
+ + +
+ +
+
+ + + {{ 'action.apply-changes' | translate }} + + + + + + {{ 'action.decline-changes' | translate }} + + + +
+ diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js new file mode 100644 index 0000000000..2a30b0c98f --- /dev/null +++ b/ui/src/app/rulechain/rulechains.controller.js @@ -0,0 +1,188 @@ +/* + * Copyright © 2016-2018 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. + */ +/* eslint-disable import/no-unresolved, import/default */ + +import addRuleChainTemplate from './add-rulechain.tpl.html'; +import ruleChainCard from './rulechain-card.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleChainsController(ruleChainService, userService, importExport, $state, $stateParams, $filter, $translate, types) { + + var ruleChainActionsList = [ + { + onAction: function ($event, item) { + vm.grid.openItem($event, item); + }, + name: function() { return $translate.instant('rulechain.details') }, + details: function() { return $translate.instant('rulechain.rulechain-details') }, + icon: "edit" + }, + { + onAction: function ($event, item) { + exportRuleChain($event, item); + }, + name: function() { $translate.instant('action.export') }, + details: function() { return $translate.instant('rulechain.export') }, + icon: "file_download" + }, + { + onAction: function ($event, item) { + vm.grid.deleteItem($event, item); + }, + name: function() { return $translate.instant('action.delete') }, + details: function() { return $translate.instant('rulechain.delete') }, + icon: "delete", + isEnabled: isRuleChainEditable + } + ]; + + var ruleChainAddItemActionsList = [ + { + onAction: function ($event) { + vm.grid.addItem($event); + }, + name: function() { return $translate.instant('action.create') }, + details: function() { return $translate.instant('rulechain.create-new-rulechain') }, + icon: "insert_drive_file" + }, + { + onAction: function ($event) { + importExport.importRuleChain($event).then( + function() { + vm.grid.refreshList(); + } + ); + }, + name: function() { return $translate.instant('action.import') }, + details: function() { return $translate.instant('rulechain.import') }, + icon: "file_upload" + } + ]; + + var vm = this; + + vm.types = types; + + vm.ruleChainGridConfig = { + + refreshParamsFunc: null, + + deleteItemTitleFunc: deleteRuleChainTitle, + deleteItemContentFunc: deleteRuleChainText, + deleteItemsTitleFunc: deleteRuleChainsTitle, + deleteItemsActionTitleFunc: deleteRuleChainsActionTitle, + deleteItemsContentFunc: deleteRuleChainsText, + + fetchItemsFunc: fetchRuleChains, + saveItemFunc: saveRuleChain, + clickItemFunc: openRuleChain, + deleteItemFunc: deleteRuleChain, + + getItemTitleFunc: getRuleChainTitle, + itemCardTemplateUrl: ruleChainCard, + parentCtl: vm, + + actionsList: ruleChainActionsList, + addItemActions: ruleChainAddItemActionsList, + + onGridInited: gridInited, + + addItemTemplateUrl: addRuleChainTemplate, + + addItemText: function() { return $translate.instant('rulechain.add-rulechain-text') }, + noItemsText: function() { return $translate.instant('rulechain.no-rulechains-text') }, + itemDetailsText: function() { return $translate.instant('rulechain.rulechain-details') }, + isSelectionEnabled: isRuleChainEditable, + isDetailsReadOnly: function(ruleChain) { + return !isRuleChainEditable(ruleChain); + } + }; + + if (angular.isDefined($stateParams.items) && $stateParams.items !== null) { + vm.ruleChainGridConfig.items = $stateParams.items; + } + + if (angular.isDefined($stateParams.topIndex) && $stateParams.topIndex > 0) { + vm.ruleChainGridConfig.topIndex = $stateParams.topIndex; + } + + vm.isRuleChainEditable = isRuleChainEditable; + + vm.exportRuleChain = exportRuleChain; + + function deleteRuleChainTitle(ruleChain) { + return $translate.instant('rulechain.delete-rulechain-title', {ruleChainName: ruleChain.name}); + } + + function deleteRuleChainText() { + return $translate.instant('rulechain.delete-rulechain-text'); + } + + function deleteRuleChainsTitle(selectedCount) { + return $translate.instant('rulechain.delete-rulechains-title', {count: selectedCount}, 'messageformat'); + } + + function deleteRuleChainsActionTitle(selectedCount) { + return $translate.instant('rulechain.delete-rulechains-action-title', {count: selectedCount}, 'messageformat'); + } + + function deleteRuleChainsText() { + return $translate.instant('rulechain.delete-rulechains-text'); + } + + function gridInited(grid) { + vm.grid = grid; + } + + function fetchRuleChains(pageLink) { + return ruleChainService.getRuleChains(pageLink); + } + + function saveRuleChain(ruleChain) { + return ruleChainService.saveRuleChain(ruleChain); + } + + function openRuleChain($event, ruleChain) { + if ($event) { + $event.stopPropagation(); + } + $state.go('home.ruleChains.ruleChain', {ruleChainId: ruleChain.id.id}); + } + + function deleteRuleChain(ruleChainId) { + return ruleChainService.deleteRuleChain(ruleChainId); + } + + function getRuleChainTitle(ruleChain) { + return ruleChain ? ruleChain.name : ''; + } + + function isRuleChainEditable(ruleChain) { + if (userService.getAuthority() === 'TENANT_ADMIN') { + return ruleChain && ruleChain.tenantId.id != types.id.nullUid; + } else { + return userService.getAuthority() === 'SYS_ADMIN'; + } + } + + function exportRuleChain($event, ruleChain) { + $event.stopPropagation(); + importExport.exportRuleChain(ruleChain.id.id); + } + +} diff --git a/ui/src/app/rulechain/rulenode-fieldset.tpl.html b/ui/src/app/rulechain/rulenode-fieldset.tpl.html new file mode 100644 index 0000000000..2b2faf8257 --- /dev/null +++ b/ui/src/app/rulechain/rulenode-fieldset.tpl.html @@ -0,0 +1,55 @@ + +{{ 'rulenode.delete' | translate }} + + +
+ + + + +
+ + + +
+
rulenode.name-required
+
+ + + + + +
+
+ + + + + + +
+
+ diff --git a/ui/src/app/rulechain/rulenode.directive.js b/ui/src/app/rulechain/rulenode.directive.js new file mode 100644 index 0000000000..7fa4a18ca3 --- /dev/null +++ b/ui/src/app/rulechain/rulenode.directive.js @@ -0,0 +1,79 @@ +/* + * Copyright © 2016-2018 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. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import ruleNodeFieldsetTemplate from './rulenode-fieldset.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleNodeDirective($compile, $templateCache, ruleChainService, types) { + var linker = function (scope, element) { + var template = $templateCache.get(ruleNodeFieldsetTemplate); + element.html(template); + + scope.types = types; + + scope.params = { + targetRuleChainId: null + }; + + scope.$watch('ruleNode', function() { + if (scope.ruleNode && scope.ruleNode.nodeType == types.ruleNodeType.RULE_CHAIN.value) { + scope.params.targetRuleChainId = scope.ruleNode.targetRuleChainId; + watchTargetRuleChain(); + } else { + if (scope.targetRuleChainWatch) { + scope.targetRuleChainWatch(); + scope.targetRuleChainWatch = null; + } + } + }); + + function watchTargetRuleChain() { + scope.targetRuleChainWatch = scope.$watch('params.targetRuleChainId', + function(targetRuleChainId) { + if (scope.ruleNode.targetRuleChainId != targetRuleChainId) { + scope.ruleNode.targetRuleChainId = targetRuleChainId; + if (targetRuleChainId) { + ruleChainService.getRuleChain(targetRuleChainId).then( + (ruleChain) => { + scope.ruleNode.name = ruleChain.name; + } + ); + } else { + scope.ruleNode.name = ""; + } + } + } + ); + } + $compile(element.contents())(scope); + } + return { + restrict: "E", + link: linker, + scope: { + ruleChainId: '=', + ruleNode: '=', + isEdit: '=', + isReadOnly: '=', + theForm: '=', + onDeleteRuleNode: '&' + } + }; +} diff --git a/ui/src/app/rulechain/rulenode.tpl.html b/ui/src/app/rulechain/rulenode.tpl.html new file mode 100644 index 0000000000..f1d3619ebc --- /dev/null +++ b/ui/src/app/rulechain/rulenode.tpl.html @@ -0,0 +1,45 @@ + +
+
+ {{node.icon}} +
+ {{ node.type }} + {{ node.name }} +
+
+
+
+
+
+
+
+
+
+
+
+
+ × +
+
From a5c59e5c88b2ed17c8eec24cf5946401c098713d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 21 Mar 2018 15:03:21 +0200 Subject: [PATCH 19/75] Update ngFlowchart git repository --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index b602720a48..e68aa34223 100644 --- a/ui/package.json +++ b/ui/package.json @@ -69,7 +69,7 @@ "moment": "^2.15.0", "ngclipboard": "^1.1.1", "ngreact": "^0.3.0", - "ngFlowchart": "git://github.com/ikulikov/ngFlowchart.git#master", + "ngFlowchart": "git://github.com/thingsboard/ngFlowchart.git#master", "objectpath": "^1.2.1", "oclazyload": "^1.0.9", "raphael": "^2.2.7", From cb20bcc23a3c8da5871907bc76a67942d132f89d Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Wed, 21 Mar 2018 16:31:25 +0200 Subject: [PATCH 20/75] add Annotation description to Nodes --- .../org/thingsboard/rule/engine/filter/TbJsFilterNode.java | 1 + .../org/thingsboard/rule/engine/filter/TbJsSwitchNode.java | 1 + .../thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java | 1 + .../rule/engine/transform/TbChangeOriginatorNode.java | 6 ++---- .../rule/engine/transform/TbTransformMsgNode.java | 6 ++---- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 089c9b1919..d3fee6859e 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -26,6 +26,7 @@ import javax.script.Bindings; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j +@FilterNode(name = "Filter Node", relationTypes = {"True", "False", "Failure"}) public class TbJsFilterNode implements TbNode { private TbJsFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index afd81636a0..5c7d1d10f4 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -27,6 +27,7 @@ import java.util.Set; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j +@FilterNode(name = "Switch Node", customRelations = true) public class TbJsSwitchNode implements TbNode { private TbJsSwitchNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index 026da1ba83..381512a806 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.msg.TbMsg; * Created by ashvayka on 19.01.18. */ @Slf4j +@FilterNode(name = "Message Type Filter Node") public class TbMsgTypeFilterNode implements TbNode { TbMsgTypeFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index 2592af253e..36063b7fc2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -22,10 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader; @@ -35,6 +32,7 @@ import org.thingsboard.server.common.msg.TbMsg; import java.util.HashSet; @Slf4j +@EnrichmentNode(name = "Change Originator Node") public class TbChangeOriginatorNode extends TbAbstractTransformNode { protected static final String CUSTOMER_SOURCE = "CUSTOMER"; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index 241fbfbf7e..c0d20f43c4 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -17,15 +17,13 @@ package org.thingsboard.rule.engine.transform; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.api.TbNodeState; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.js.NashornJsEngine; import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; +@EnrichmentNode(name = "Transformation Node") public class TbTransformMsgNode extends TbAbstractTransformNode { private TbTransformMsgNodeConfiguration config; From 344f6045a64dd2f3ff9aaeade9629868fd63754d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 21 Mar 2018 17:34:07 +0200 Subject: [PATCH 21/75] Use ComponentDescriptors in RuleChain UI --- .../server/controller/BaseController.java | 10 ++ .../ComponentDescriptorController.java | 18 ++++ .../AnnotationComponentDiscoveryService.java | 9 ++ .../component/ComponentDiscoveryService.java | 3 + .../app/api/component-descriptor.service.js | 38 +++++++- ui/src/app/api/rule-chain.service.js | 92 ++++--------------- ui/src/app/common/types.constant.js | 11 +++ ui/src/app/locale/locale.constant.js | 4 +- .../app/rulechain/rulechain-fieldset.tpl.html | 5 + ui/src/app/rulechain/rulechain.controller.js | 70 +++++++------- ui/src/app/rulechain/rulechain.tpl.html | 2 +- .../app/rulechain/rulenode-fieldset.tpl.html | 11 ++- ui/src/app/rulechain/rulenode.directive.js | 2 +- ui/src/app/rulechain/rulenode.tpl.html | 2 +- 14 files changed, 161 insertions(+), 116 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index 2a4ba719af..d1c282508b 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -71,6 +71,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.UUID; import static org.thingsboard.server.dao.service.Validator.validateId; @@ -480,6 +481,15 @@ public abstract class BaseController { } } + List checkComponentDescriptorsByTypes(Set types) throws ThingsboardException { + try { + log.debug("[{}] Lookup component descriptors", types); + return componentDescriptorService.getComponents(types); + } catch (Exception e) { + throw handleException(e, false); + } + } + List checkPluginActionsByPluginClazz(String pluginClazz) throws ThingsboardException { try { checkComponentDescriptorByClazz(pluginClazz); diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java index e63a443769..7a43cd35a2 100644 --- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java +++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java @@ -21,7 +21,9 @@ import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.exception.ThingsboardException; +import java.util.HashSet; import java.util.List; +import java.util.Set; @RestController @RequestMapping("/api") @@ -51,6 +53,22 @@ public class ComponentDescriptorController extends BaseController { } } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')") + @RequestMapping(value = "/components", params = {"componentTypes"}, method = RequestMethod.GET) + @ResponseBody + public List getComponentDescriptorsByTypes(@RequestParam("componentTypes") String[] strComponentTypes) throws ThingsboardException { + checkArrayParameter("componentTypes", strComponentTypes); + try { + Set componentTypes = new HashSet<>(); + for (String strComponentType : strComponentTypes) { + componentTypes.add(ComponentType.valueOf(strComponentType)); + } + return checkComponentDescriptorsByTypes(componentTypes); + } catch (Exception e) { + throw handleException(e); + } + } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')") @RequestMapping(value = "/components/actions/{pluginClazz:.+}", method = RequestMethod.GET) @ResponseBody diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java index 910b45954a..d9416d7226 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java @@ -203,6 +203,15 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe return Collections.unmodifiableList(componentsMap.get(type)); } + @Override + public List getComponents(Set types) { + List result = new ArrayList<>(); + for (ComponentType type : types) { + result.addAll(componentsMap.get(type)); + } + return Collections.unmodifiableList(result); + } + @Override public Optional getComponent(String clazz) { return Optional.ofNullable(components.get(clazz)); diff --git a/application/src/main/java/org/thingsboard/server/service/component/ComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/ComponentDiscoveryService.java index ea27e60646..7a15a1b253 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/ComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/ComponentDiscoveryService.java @@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; import java.util.List; import java.util.Optional; +import java.util.Set; /** * @author Andrew Shvayka @@ -30,6 +31,8 @@ public interface ComponentDiscoveryService { List getComponents(ComponentType type); + List getComponents(Set types); + Optional getComponent(String clazz); List getPluginActions(String pluginClazz); diff --git a/ui/src/app/api/component-descriptor.service.js b/ui/src/app/api/component-descriptor.service.js index 4478d71b95..cc3f710629 100644 --- a/ui/src/app/api/component-descriptor.service.js +++ b/ui/src/app/api/component-descriptor.service.js @@ -26,7 +26,8 @@ function ComponentDescriptorService($http, $q) { var service = { getComponentDescriptorsByType: getComponentDescriptorsByType, getComponentDescriptorByClazz: getComponentDescriptorByClazz, - getPluginActionsByPluginClazz: getPluginActionsByPluginClazz + getPluginActionsByPluginClazz: getPluginActionsByPluginClazz, + getComponentDescriptorsByTypes: getComponentDescriptorsByTypes } return service; @@ -52,6 +53,41 @@ function ComponentDescriptorService($http, $q) { return deferred.promise; } + function getComponentDescriptorsByTypes(componentTypes) { + var deferred = $q.defer(); + var result = []; + for (var i=componentTypes.length-1;i>=0;i--) { + var componentType = componentTypes[i]; + if (componentsByType[componentType]) { + result = result.concat(componentsByType[componentType]); + componentTypes.splice(i, 1); + } + } + if (!componentTypes.length) { + deferred.resolve(result); + } else { + var url = '/api/components?componentTypes=' + componentTypes.join(','); + $http.get(url, null).then(function success(response) { + var components = response.data; + for (var i = 0; i < components.length; i++) { + var component = components[i]; + var componentsList = componentsByType[component.type]; + if (!componentsList) { + componentsList = []; + componentsByType[component.type] = componentsList; + } + componentsList.push(component); + componentsByClazz[component.clazz] = component; + } + result = result.concat(components); + deferred.resolve(components); + }, function fail() { + deferred.reject(); + }); + } + return deferred.promise; + } + function getComponentDescriptorByClazz(componentDescriptorClazz) { var deferred = $q.defer(); if (componentsByClazz[componentDescriptorClazz]) { diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index be8e99db11..f17553545e 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -17,9 +17,9 @@ export default angular.module('thingsboard.api.ruleChain', []) .factory('ruleChainService', RuleChainService).name; /*@ngInject*/ -function RuleChainService($http, $q, $filter, types) { +function RuleChainService($http, $q, $filter, types, componentDescriptorService) { - var ruleNodeTypes = null; + var ruleNodeComponents = null; var service = { getSystemRuleChains: getSystemRuleChains, @@ -30,8 +30,8 @@ function RuleChainService($http, $q, $filter, types) { deleteRuleChain: deleteRuleChain, getRuleChainMetaData: getRuleChainMetaData, saveRuleChainMetaData: saveRuleChainMetaData, - getRuleNodeTypes: getRuleNodeTypes, - getRuleNodeComponentType: getRuleNodeComponentType, + getRuleNodeComponents: getRuleNodeComponents, + getRuleNodeComponentByClazz: getRuleNodeComponentByClazz, getRuleNodeSupportedLinks: getRuleNodeSupportedLinks, resolveTargetRuleChains: resolveTargetRuleChains }; @@ -165,21 +165,18 @@ function RuleChainService($http, $q, $filter, types) { return deferred.promise; } - function getRuleNodeTypes() { + function getRuleNodeComponents() { var deferred = $q.defer(); - if (ruleNodeTypes) { - deferred.resolve(ruleNodeTypes); + if (ruleNodeComponents) { + deferred.resolve(ruleNodeComponents); } else { - loadRuleNodeTypes().then( - (nodeTypes) => { - ruleNodeTypes = nodeTypes; - ruleNodeTypes.push( - { - nodeType: types.ruleNodeType.RULE_CHAIN.value, - type: 'Rule chain' - } + loadRuleNodeComponents().then( + (components) => { + ruleNodeComponents = components; + ruleNodeComponents.push( + types.ruleChainNodeComponent ); - deferred.resolve(ruleNodeTypes); + deferred.resolve(ruleNodeComponents); }, () => { deferred.reject(); @@ -189,10 +186,10 @@ function RuleChainService($http, $q, $filter, types) { return deferred.promise; } - function getRuleNodeComponentType(type) { - var res = $filter('filter')(ruleNodeTypes, {type: type}, true); + function getRuleNodeComponentByClazz(clazz) { + var res = $filter('filter')(ruleNodeComponents, {clazz: clazz}, true); if (res && res.length) { - return res[0].nodeType; + return res[0]; } return null; } @@ -222,61 +219,8 @@ function RuleChainService($http, $q, $filter, types) { return deferred.promise; } - function loadRuleNodeTypes() { - var deferred = $q.defer(); - deferred.resolve( - [ - { - nodeType: types.ruleNodeType.FILTER.value, - type: 'Filter' - }, - { - nodeType: types.ruleNodeType.FILTER.value, - type: 'Switch' - }, - { - nodeType: types.ruleNodeType.ENRICHMENT.value, - type: 'Self' - }, - { - nodeType: types.ruleNodeType.ENRICHMENT.value, - type: 'Tenant/Customer' - }, - { - nodeType: types.ruleNodeType.ENRICHMENT.value, - type: 'Related Entity' - }, - { - nodeType: types.ruleNodeType.ENRICHMENT.value, - type: 'Last Telemetry' - }, - { - nodeType: types.ruleNodeType.TRANSFORMATION.value, - type: 'Modify' - }, - { - nodeType: types.ruleNodeType.TRANSFORMATION.value, - type: 'New/Update' - }, - { - nodeType: types.ruleNodeType.ACTION.value, - type: 'Telemetry' - }, - { - nodeType: types.ruleNodeType.ACTION.value, - type: 'RPC call' - }, - { - nodeType: types.ruleNodeType.ACTION.value, - type: 'Send email' - }, - { - nodeType: types.ruleNodeType.ACTION.value, - type: 'Alarm' - } - ] - ); - return deferred.promise; + function loadRuleNodeComponents() { + return componentDescriptorService.getComponentDescriptorsByTypes(types.ruleNodeTypeComponentTypes); } diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index b134bf0575..2f8d152029 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -457,6 +457,17 @@ export default angular.module('thingsboard.types', []) clientSide: false } }, + ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION"], + ruleChainNodeComponent: { + type: 'RULE_CHAIN', + name: 'Rule chain', + clazz: 'tb.internal.RuleChain' + }, + inputNodeComponent: { + type: 'INPUT', + name: 'Input', + clazz: 'tb.internal.Input' + }, ruleNodeType: { FILTER: { value: "FILTER", diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 4c392ca84d..18c9330165 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1167,7 +1167,8 @@ export default angular.module('thingsboard.locale', []) "select-rulechain": "Select rule chain", "no-rulechains-matching": "No rule chains matching '{{entity}}' were found.", "rulechain-required": "Rule chain is required", - "management": "Rules management" + "management": "Rules management", + "debug-mode": "Debug mode" }, "rulenode": { "add": "Add rule node", @@ -1177,6 +1178,7 @@ export default angular.module('thingsboard.locale', []) "description": "Description", "delete": "Delete rule node", "rulenode-details": "Rule node details", + "debug-mode": "Debug mode", "link-details": "Rule node link details", "add-link": "Add link", "link-label": "Link label", diff --git a/ui/src/app/rulechain/rulechain-fieldset.tpl.html b/ui/src/app/rulechain/rulechain-fieldset.tpl.html index a79ba35cf0..2189daaeee 100644 --- a/ui/src/app/rulechain/rulechain-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulechain-fieldset.tpl.html @@ -41,6 +41,11 @@
rulechain.name-required
+ + {{ 'rulechain.debug-mode' | translate }} + + diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index c854cfa36d..31886b8a28 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -54,6 +54,7 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans }; vm.ruleNodeTypesModel = {}; + vm.ruleChainLibraryLoaded = false; for (var type in types.ruleNodeType) { if (!types.ruleNodeType[type].special) { vm.ruleNodeTypesModel[type] = { @@ -141,8 +142,8 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans vm.editCallbacks = { edgeDoubleClick: function (event, edge) { var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); - if (sourceNode.nodeType != types.ruleNodeType.INPUT.value) { - ruleChainService.getRuleNodeSupportedLinks(sourceNode.type).then( + if (sourceNode.component.type != types.ruleNodeType.INPUT.value) { + ruleChainService.getRuleNodeSupportedLinks(sourceNode.component.clazz).then( (labels) => { vm.isEditingRuleNode = false; vm.editingRuleNode = null; @@ -156,7 +157,7 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans }, nodeCallbacks: { 'doubleClick': function (event, node) { - if (node.nodeType != types.ruleNodeType.INPUT.value) { + if (node.component.type != types.ruleNodeType.INPUT.value) { vm.isEditingRuleNodeLink = false; vm.editingRuleNodeLink = null; vm.isEditingRuleNode = true; @@ -171,9 +172,9 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans createEdge: function (event, edge) { var deferred = $q.defer(); var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); - if (sourceNode.nodeType == types.ruleNodeType.INPUT.value) { + if (sourceNode.component.type == types.ruleNodeType.INPUT.value) { var destNode = vm.modelservice.nodes.getNodeByConnectorId(edge.destination); - if (destNode.nodeType == types.ruleNodeType.RULE_CHAIN.value) { + if (destNode.component.type == types.ruleNodeType.RULE_CHAIN.value) { deferred.reject(); } else { var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}); @@ -183,7 +184,7 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans deferred.resolve(edge); } } else { - ruleChainService.getRuleNodeSupportedLinks(sourceNode.type).then( + ruleChainService.getRuleNodeSupportedLinks(sourceNode.component.clazz).then( (labels) => { addRuleNodeLink(event, edge, labels).then( (link) => { @@ -209,24 +210,23 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans loadRuleChainLibrary(); function loadRuleChainLibrary() { - ruleChainService.getRuleNodeTypes().then( - (ruleNodeTypes) => { - for (var i=0;i { + for (var i=0;i
- +
{{vm.types.ruleNodeType[typeId].name}}
diff --git a/ui/src/app/rulechain/rulenode-fieldset.tpl.html b/ui/src/app/rulechain/rulenode-fieldset.tpl.html index 2b2faf8257..0d16e45405 100644 --- a/ui/src/app/rulechain/rulenode-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulenode-fieldset.tpl.html @@ -23,9 +23,9 @@
- + -
+
@@ -33,12 +33,17 @@
rulenode.name-required
+ + {{ 'rulenode.debug-mode' | translate }} + +
-
+
{{node.icon}}
- {{ node.type }} + {{ node.component.name }} {{ node.name }}
From c5b03cb5b38d8a5ff935c797ff515cea1d11214b Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 21 Mar 2018 19:40:25 +0200 Subject: [PATCH 22/75] Fix for RPC calls in Kafka actions --- .../server/common/msg/core/ToServerRpcRequestMsg.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java index ace51c03a7..87708a759f 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java @@ -16,16 +16,16 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; -import org.thingsboard.server.common.msg.session.FromDeviceMsg; +import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.common.msg.session.MsgType; /** * @author Andrew Shvayka */ @Data -public class ToServerRpcRequestMsg implements FromDeviceMsg { +public class ToServerRpcRequestMsg implements FromDeviceRequestMsg { - private final int requestId; + private final Integer requestId; private final String method; private final String params; From f8ec713d4a36446ebb383af81ba800f065d1f7d4 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Thu, 22 Mar 2018 10:53:50 +0200 Subject: [PATCH 23/75] update description in Node Annotations --- .../rule/engine/api/EnrichmentNode.java | 11 +++++++++-- .../thingsboard/rule/engine/api/FilterNode.java | 11 +++++++++-- .../rule/engine/api/TransformationNode.java | 8 ++++++++ .../rule/engine/filter/TbJsFilterNode.java | 7 ++++++- .../rule/engine/filter/TbJsSwitchNode.java | 7 ++++++- .../rule/engine/filter/TbMsgTypeFilterNode.java | 5 ++++- .../rule/engine/metadata/TbGetAttributesNode.java | 14 +++++++------- .../metadata/TbGetCustomerAttributeNode.java | 6 +++++- .../engine/metadata/TbGetRelatedAttributeNode.java | 8 +++++++- .../engine/metadata/TbGetTenantAttributeNode.java | 6 +++++- .../engine/transform/TbChangeOriginatorNode.java | 5 ++++- .../rule/engine/transform/TbTransformMsgNode.java | 6 +++++- 12 files changed, 75 insertions(+), 19 deletions(-) diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java index 2267bdae67..b3ff2559eb 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java @@ -16,7 +16,6 @@ package org.thingsboard.rule.engine.api; import org.thingsboard.server.common.data.plugin.ComponentScope; -import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -32,11 +31,19 @@ public @interface EnrichmentNode { String name(); + String nodeDescription(); + + String nodeDetails(); + + boolean inEnabled() default true; + + boolean outEnabled() default true; + ComponentScope scope() default ComponentScope.TENANT; String descriptor() default "EmptyNodeDescriptor.json"; - String[] relationTypes() default {"Success","Failure"}; + String[] relationTypes() default {"Success", "Failure"}; boolean customRelations() default false; } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java index 5247e397dd..d34755dc2c 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java @@ -16,7 +16,6 @@ package org.thingsboard.rule.engine.api; import org.thingsboard.server.common.data.plugin.ComponentScope; -import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -32,11 +31,19 @@ public @interface FilterNode { String name(); + String nodeDescription(); + + String nodeDetails(); + + boolean inEnabled() default true; + + boolean outEnabled() default true; + ComponentScope scope() default ComponentScope.TENANT; String descriptor() default "EmptyNodeDescriptor.json"; - String[] relationTypes() default {"Success","Failure"}; + String[] relationTypes() default {"Success", "Failure"}; boolean customRelations() default false; diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java index bfe1dcaeda..76b0dda01e 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java @@ -32,6 +32,14 @@ public @interface TransformationNode { String name(); + String nodeDescription(); + + String nodeDetails(); + + boolean inEnabled() default true; + + boolean outEnabled() default true; + ComponentScope scope() default ComponentScope.TENANT; String descriptor() default "EmptyNodeDescriptor.json"; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index d3fee6859e..393496a41e 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -26,7 +26,12 @@ import javax.script.Bindings; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j -@FilterNode(name = "Filter Node", relationTypes = {"True", "False", "Failure"}) +@FilterNode(name = "script", relationTypes = {"True", "False", "Failure"}, + nodeDescription = "Filter incoming messages using JS script", + nodeDetails = "Evaluate incoming Message with configured JS condition. " + + "If 'True' - send Message via 'True' chain, otherwise 'False' chain is used." + + "Message payload can be accessed via 'msg' property. For example 'msg.temperature < 10;'" + + "Message metadata can be accessed via 'meta' property. For example 'meta.customerName === 'John';'") public class TbJsFilterNode implements TbNode { private TbJsFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 5c7d1d10f4..dff214567d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -27,7 +27,12 @@ import java.util.Set; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j -@FilterNode(name = "Switch Node", customRelations = true) +@FilterNode(name = "switch", customRelations = true, + nodeDescription = "Route incoming Message to one or multiple output chains", + nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + + "If Array is empty - message not routed to next Node. " + + "Message payload can be accessed via 'msg' property. For example 'msg.temperature < 10;' " + + "Message metadata can be accessed via 'meta' property. For example 'meta.customerName === 'John';' ") public class TbJsSwitchNode implements TbNode { private TbJsSwitchNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index 381512a806..c08c3e0bf5 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -24,7 +24,10 @@ import org.thingsboard.server.common.msg.TbMsg; * Created by ashvayka on 19.01.18. */ @Slf4j -@FilterNode(name = "Message Type Filter Node") +@FilterNode(name = "message type", + nodeDescription = "Filter incoming messages by Message Type", + nodeDetails = "Evaluate incoming Message with configured JS condition. " + + "If incoming MessageType is expected - send Message via 'Success' chain, otherwise 'Failure' chain is used.") public class TbMsgTypeFilterNode implements TbNode { TbMsgTypeFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 90eadcb2c7..216cf28015 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -21,12 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.api.TbNodeState; -import org.thingsboard.rule.engine.api.TbNode; -import org.thingsboard.rule.engine.api.EnrichmentNode; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; @@ -40,7 +35,12 @@ import static org.thingsboard.server.common.data.DataConstants.*; * Created by ashvayka on 19.01.18. */ @Slf4j -@EnrichmentNode(name = "Get Attributes Node") +@EnrichmentNode(name = "originator attributes", + nodeDescription = "Add Message Originator Attributes or Latest Telemetry into Message Metadata", + nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + + "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + + "'meta.cs.temperature' or 'meta.shared.limit' " + + "If Latest Telemetry enrichment configured, latest telemetry added into metadata without prefix.") public class TbGetAttributesNode implements TbNode { private TbGetAttributesNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index 18ddfcf6b9..c9cabaaabc 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -22,7 +22,11 @@ import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; -@EnrichmentNode(name="Get Customer Attributes Node") +@EnrichmentNode(name="customer attributes", + nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata", + nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + + "To access those attributes in other nodes this template can be used " + + "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 3a0dce85a2..f85d019b04 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -26,7 +26,13 @@ import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; import org.thingsboard.server.common.data.id.EntityId; -@EnrichmentNode(name="Get Related Entity Attributes Node") +@EnrichmentNode(name="related attributes", + nodeDescription = "Add Originators Related Entity Attributes or Latest Telemetry into Message Metadata", + nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + + "If multiple Related Entities are found, only first Entity is used for attributes enrichment, other entities are discarded. " + + "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + + "To access those attributes in other nodes this template can be used " + + "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index e51c053ca2..2603bc5cc1 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -24,7 +24,11 @@ import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; @Slf4j -@EnrichmentNode(name="Get Tenant Attributes Node") +@EnrichmentNode(name="tenant attributes", + nodeDescription = "Add Originators Tenant Attributes or Latest Telemetry into Message Metadata", + nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + + "To access those attributes in other nodes this template can be used " + + "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index 36063b7fc2..8ab8e18abc 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -32,7 +32,10 @@ import org.thingsboard.server.common.msg.TbMsg; import java.util.HashSet; @Slf4j -@EnrichmentNode(name = "Change Originator Node") +@TransformationNode(name="change originator", + nodeDescription = "Change Message Originator To Tenant/Customer/Related Entity", + nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + + "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ") public class TbChangeOriginatorNode extends TbAbstractTransformNode { protected static final String CUSTOMER_SOURCE = "CUSTOMER"; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index c0d20f43c4..3cd7cd1374 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -23,7 +23,11 @@ import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; -@EnrichmentNode(name = "Transformation Node") +@TransformationNode(name = "script", + nodeDescription = "Change Message payload and Metadata using JavaScript", + nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside. " + + "'meta' - is a Message metadata. " + + "'msg' - is a Message payload. Any properties can be changed/removed/added in those objects.") public class TbTransformMsgNode extends TbAbstractTransformNode { private TbTransformMsgNodeConfiguration config; From dff2ca0cb18fe5e03e95fa76dcb9f2ec465fd96f Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 22 Mar 2018 11:15:22 +0200 Subject: [PATCH 24/75] Rule Node tooltips --- ui/src/app/rulechain/rulechain.controller.js | 82 +++++++++++++++++++- ui/src/app/rulechain/rulechain.tpl.html | 8 +- ui/src/app/rulechain/rulenode.tpl.html | 5 +- 3 files changed, 91 insertions(+), 4 deletions(-) diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 31886b8a28..76d0fec0c5 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -16,6 +16,10 @@ import './rulechain.scss'; +import 'tooltipster/dist/css/tooltipster.bundle.min.css'; +import 'tooltipster/dist/js/tooltipster.bundle.min.js'; +import 'tooltipster/dist/css/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-shadow.min.css'; + /* eslint-disable import/no-unresolved, import/default */ import addRuleNodeTemplate from './add-rulenode.tpl.html'; @@ -30,7 +34,7 @@ const aKeyCode = 65; const escKeyCode = 27; /*@ngInject*/ -export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpansionPanel, $document, $mdDialog, $filter, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { +export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, $timeout, $mdExpansionPanel, $document, $mdDialog, $filter, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { var vm = this; @@ -139,6 +143,82 @@ export function RuleChainController($stateParams, $scope, $q, $mdUtil, $mdExpans vm.editingRuleNodeLink = angular.copy(edge); }; + vm.nodeLibCallbacks = { + nodeCallbacks: { + 'mouseEnter': function (event, node) { + displayNodeDescriptionTooltip(event, node); + }, + 'mouseLeave': function () { + destroyTooltips(); + } + } + }; + + vm.typeHeaderMouseEnter = function(event, typeId) { + displayTooltip(event, + '
' + + '
' + + '
' + typeId + '
' + + '
' + 'Some description of component type' + '
' + + '
' + + '
' + ); + }; + + vm.destroyTooltips = destroyTooltips; + + function destroyTooltips() { + if (vm.tooltipTimeout) { + $timeout.cancel(vm.tooltipTimeout); + vm.tooltipTimeout = null; + } + var instances = angular.element.tooltipster.instances(); + instances.forEach((instance) => { + instance.destroy(); + }); + } + + function displayNodeDescriptionTooltip(event, node) { + displayTooltip(event, + '
' + + '
' + + '
' + node.component.name + '
' + + '
' + 'Some description of node' + '
' + + '
' + + '
' + ); + } + + function displayTooltip(event, content) { + destroyTooltips(); + vm.tooltipTimeout = $timeout(() => { + var element = angular.element(event.target); + element.tooltipster( + { + theme: 'tooltipster-shadow', + delay: 100, + trigger: 'custom', + triggerOpen: { + click: false, + tap: false + }, + triggerClose: { + click: true, + tap: true, + scroll: true + }, + side: 'right', + trackOrigin: true + } + ); + var contentElement = angular.element(content); + $compile(contentElement)($scope); + var tooltip = element.tooltipster('instance'); + tooltip.content(contentElement); + tooltip.open(); + }, 500); + } + vm.editCallbacks = { edgeDoubleClick: function (event, edge) { var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 30f2caa91f..9f1141e887 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -23,12 +23,15 @@
- +
{{vm.types.ruleNodeType[typeId].name}}
 - +
{{vm.types.ruleNodeType[typeId].name}}
 @@ -36,6 +39,7 @@ diff --git a/ui/src/app/rulechain/rulenode.tpl.html b/ui/src/app/rulechain/rulenode.tpl.html index f8e08e0d2c..5a521a8333 100644 --- a/ui/src/app/rulechain/rulenode.tpl.html +++ b/ui/src/app/rulechain/rulenode.tpl.html @@ -18,7 +18,10 @@
+ ng-dblclick="callbacks.doubleClick($event, node)" + ng-mouseover="callbacks.mouseOver($event, node)" + ng-mouseenter="callbacks.mouseEnter($event, node)" + ng-mouseleave="callbacks.mouseLeave($event, node)">
{{node.icon}} From 8f3fbc945dd7c33c1eb1305e499e07725d2c0570 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 22 Mar 2018 13:16:28 +0200 Subject: [PATCH 25/75] RuleNode annotation refactoring --- .../AnnotationComponentDiscoveryService.java | 90 ++++++++++++------- .../rule/engine/api/ActionNode.java | 43 --------- .../rule/engine/api/EnrichmentNode.java | 49 ---------- .../rule/engine/api/NodeDefinition.java | 33 +++++++ .../api/{FilterNode.java => RuleNode.java} | 11 ++- .../rule/engine/api/TransformationNode.java | 51 ----------- .../src/main/resources/EmptyNodeConfig.json | 2 + .../rule/engine/filter/TbJsFilterNode.java | 11 ++- .../rule/engine/filter/TbJsSwitchNode.java | 9 +- .../engine/filter/TbMsgTypeFilterNode.java | 7 +- .../engine/metadata/TbGetAttributesNode.java | 12 +-- .../metadata/TbGetCustomerAttributeNode.java | 9 +- .../metadata/TbGetRelatedAttributeNode.java | 13 ++- .../metadata/TbGetTenantAttributeNode.java | 9 +- .../transform/TbChangeOriginatorNode.java | 5 +- .../engine/transform/TbTransformMsgNode.java | 11 ++- ui/src/app/common/types.constant.js | 15 +++- ui/src/app/rulechain/rulechain.controller.js | 3 +- ui/src/app/rulechain/rulechain.scss | 29 ++++++ 19 files changed, 194 insertions(+), 218 deletions(-) delete mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java delete mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java rename rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/{FilterNode.java => RuleNode.java} (87%) delete mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java create mode 100644 rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java index d9416d7226..52d7d7d80c 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java @@ -16,6 +16,8 @@ package org.thingsboard.server.service.component; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Charsets; import com.google.common.io.Resources; import lombok.extern.slf4j.Slf4j; @@ -26,16 +28,14 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen import org.springframework.core.env.Environment; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.stereotype.Service; -import org.thingsboard.rule.engine.api.ActionNode; -import org.thingsboard.rule.engine.api.EnrichmentNode; -import org.thingsboard.rule.engine.api.FilterNode; -import org.thingsboard.rule.engine.api.TransformationNode; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.dao.component.ComponentDescriptorService; import org.thingsboard.server.extensions.api.component.*; import javax.annotation.PostConstruct; +import java.io.IOException; import java.lang.annotation.Annotation; import java.util.*; import java.util.stream.Collectors; @@ -70,6 +70,24 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe } } + private void registerRuleNodeComponents() { + Set ruleNodeBeanDefinitions = getBeanDefinitions(RuleNode.class); + for (BeanDefinition def : ruleNodeBeanDefinitions) { + try { + String clazzName = def.getBeanClassName(); + Class clazz = Class.forName(clazzName); + RuleNode ruleNodeAnnotation = clazz.getAnnotation(RuleNode.class); + ComponentType type = ruleNodeAnnotation.type(); + ComponentDescriptor component = scanAndPersistComponent(def, type); + components.put(component.getClazz(), component); + componentsMap.computeIfAbsent(type, k -> new ArrayList<>()).add(component); + } catch (Exception e) { + log.error("Can't initialize component {}, due to {}", def.getBeanClassName(), e.getMessage(), e); + throw new RuntimeException(e); + } + } + } + private void registerComponents(ComponentType type, Class annotation) { List components = persist(getBeanDefinitions(annotation), type); componentsMap.put(type, components); @@ -97,34 +115,25 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe String descriptorResourceName; switch (type) { case ENRICHMENT: - EnrichmentNode enrichmentAnnotation = clazz.getAnnotation(EnrichmentNode.class); - scannedComponent.setName(enrichmentAnnotation.name()); - scannedComponent.setScope(enrichmentAnnotation.scope()); - descriptorResourceName = enrichmentAnnotation.descriptor(); - break; case FILTER: - FilterNode filterAnnotation = clazz.getAnnotation(FilterNode.class); - scannedComponent.setName(filterAnnotation.name()); - scannedComponent.setScope(filterAnnotation.scope()); - descriptorResourceName = filterAnnotation.descriptor(); - break; case TRANSFORMATION: - TransformationNode trAnnotation = clazz.getAnnotation(TransformationNode.class); - scannedComponent.setName(trAnnotation.name()); - scannedComponent.setScope(trAnnotation.scope()); - descriptorResourceName = trAnnotation.descriptor(); - break; case ACTION: - ActionNode actionAnnotation = clazz.getAnnotation(ActionNode.class); - scannedComponent.setName(actionAnnotation.name()); - scannedComponent.setScope(actionAnnotation.scope()); - descriptorResourceName = actionAnnotation.descriptor(); + RuleNode ruleNodeAnnotation = clazz.getAnnotation(RuleNode.class); + scannedComponent.setName(ruleNodeAnnotation.name()); + scannedComponent.setScope(ruleNodeAnnotation.scope()); + NodeDefinition nodeDefinition = prepareNodeDefinition(ruleNodeAnnotation); + ObjectNode configurationDescriptor = mapper.createObjectNode(); + JsonNode node = mapper.valueToTree(nodeDefinition); + configurationDescriptor.set("nodeDefinition", node); + scannedComponent.setConfigurationDescriptor(configurationDescriptor); break; case OLD_ACTION: Action oldActionAnnotation = clazz.getAnnotation(Action.class); scannedComponent.setName(oldActionAnnotation.name()); scannedComponent.setScope(oldActionAnnotation.scope()); descriptorResourceName = oldActionAnnotation.descriptor(); + scannedComponent.setConfigurationDescriptor(mapper.readTree( + Resources.toString(Resources.getResource(descriptorResourceName), Charsets.UTF_8))); break; case PLUGIN: Plugin pluginAnnotation = clazz.getAnnotation(Plugin.class); @@ -143,12 +152,12 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe } } scannedComponent.setActions(Arrays.stream(pluginAnnotation.actions()).map(Class::getName).collect(Collectors.joining(","))); + scannedComponent.setConfigurationDescriptor(mapper.readTree( + Resources.toString(Resources.getResource(descriptorResourceName), Charsets.UTF_8))); break; default: throw new RuntimeException(type + " is not supported yet!"); } - scannedComponent.setConfigurationDescriptor(mapper.readTree( - Resources.toString(Resources.getResource(descriptorResourceName), Charsets.UTF_8))); scannedComponent.setClazz(clazzName); log.info("Processing scanned component: {}", scannedComponent); } catch (Exception e) { @@ -171,6 +180,20 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe return scannedComponent; } + private NodeDefinition prepareNodeDefinition(RuleNode nodeAnnotation) throws IOException { + NodeDefinition nodeDefinition = new NodeDefinition(); + nodeDefinition.setDetails(nodeAnnotation.nodeDetails()); + nodeDefinition.setDescription(nodeAnnotation.nodeDescription()); + nodeDefinition.setInEnabled(nodeAnnotation.inEnabled()); + nodeDefinition.setOutEnabled(nodeAnnotation.outEnabled()); + nodeDefinition.setRelationTypes(nodeAnnotation.relationTypes()); + nodeDefinition.setCustomRelations(nodeAnnotation.customRelations()); + String defaultConfigResourceName = nodeAnnotation.defaultConfigResource(); + nodeDefinition.setDefaultConfiguration(mapper.readTree( + Resources.toString(Resources.getResource(defaultConfigResourceName), Charsets.UTF_8))); + return nodeDefinition; + } + private Set getBeanDefinitions(Class componentType) { ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false); scanner.addIncludeFilter(new AnnotationTypeFilter(componentType)); @@ -183,13 +206,8 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe @Override public void discoverComponents() { - registerComponents(ComponentType.ENRICHMENT, EnrichmentNode.class); - - registerComponents(ComponentType.FILTER, FilterNode.class); - - registerComponents(ComponentType.TRANSFORMATION, TransformationNode.class); - registerComponents(ComponentType.ACTION, ActionNode.class); + registerRuleNodeComponents(); registerComponents(ComponentType.OLD_ACTION, Action.class); @@ -200,15 +218,19 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe @Override public List getComponents(ComponentType type) { - return Collections.unmodifiableList(componentsMap.get(type)); + if (componentsMap.containsKey(type)) { + return Collections.unmodifiableList(componentsMap.get(type)); + } else { + return Collections.emptyList(); + } } @Override public List getComponents(Set types) { List result = new ArrayList<>(); - for (ComponentType type : types) { + types.stream().filter(type -> componentsMap.containsKey(type)).forEach(type -> { result.addAll(componentsMap.get(type)); - } + }); return Collections.unmodifiableList(result); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java deleted file mode 100644 index 64e28f1bf2..0000000000 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ActionNode.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright © 2016-2018 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.rule.engine.api; - -import org.thingsboard.server.common.data.plugin.ComponentScope; -import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Andrew Shvayka - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface ActionNode { - - String name(); - - ComponentScope scope() default ComponentScope.TENANT; - - String descriptor() default "EmptyNodeDescriptor.json"; - - String[] relationTypes() default {"Success","Failure"}; - - boolean customRelations() default false; - -} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java deleted file mode 100644 index b3ff2559eb..0000000000 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/EnrichmentNode.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright © 2016-2018 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.rule.engine.api; - -import org.thingsboard.server.common.data.plugin.ComponentScope; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Andrew Shvayka - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface EnrichmentNode { - - String name(); - - String nodeDescription(); - - String nodeDetails(); - - boolean inEnabled() default true; - - boolean outEnabled() default true; - - ComponentScope scope() default ComponentScope.TENANT; - - String descriptor() default "EmptyNodeDescriptor.json"; - - String[] relationTypes() default {"Success", "Failure"}; - - boolean customRelations() default false; -} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java new file mode 100644 index 0000000000..6c57d92a54 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java @@ -0,0 +1,33 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Data; + +@Data +public class NodeDefinition { + + private String details; + private String description; + private boolean inEnabled; + private boolean outEnabled; + String[] relationTypes; + boolean customRelations; + JsonNode defaultConfiguration; + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java similarity index 87% rename from rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java rename to rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java index d34755dc2c..f8e0fa2e29 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/FilterNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java @@ -16,18 +16,18 @@ package org.thingsboard.rule.engine.api; import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.common.data.plugin.ComponentType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author Andrew Shvayka - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface FilterNode { +public @interface RuleNode { + + ComponentType type(); String name(); @@ -41,10 +41,9 @@ public @interface FilterNode { ComponentScope scope() default ComponentScope.TENANT; - String descriptor() default "EmptyNodeDescriptor.json"; + String defaultConfigResource() default "EmptyNodeConfig.json"; String[] relationTypes() default {"Success", "Failure"}; boolean customRelations() default false; - } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java deleted file mode 100644 index 76b0dda01e..0000000000 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TransformationNode.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright © 2016-2018 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.rule.engine.api; - -import org.thingsboard.server.common.data.plugin.ComponentScope; -import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Andrew Shvayka - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface TransformationNode { - - String name(); - - String nodeDescription(); - - String nodeDetails(); - - boolean inEnabled() default true; - - boolean outEnabled() default true; - - ComponentScope scope() default ComponentScope.TENANT; - - String descriptor() default "EmptyNodeDescriptor.json"; - - String[] relationTypes() default {"Success","Failure"}; - - boolean customRelations() default false; - -} diff --git a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json new file mode 100644 index 0000000000..7a73a41bfd --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 393496a41e..c85d4807e0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; @@ -26,12 +27,14 @@ import javax.script.Bindings; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j -@FilterNode(name = "script", relationTypes = {"True", "False", "Failure"}, +@RuleNode( + type = ComponentType.FILTER, + name = "script", relationTypes = {"True", "False", "Failure"}, nodeDescription = "Filter incoming messages using JS script", nodeDetails = "Evaluate incoming Message with configured JS condition. " + - "If 'True' - send Message via 'True' chain, otherwise 'False' chain is used." + - "Message payload can be accessed via 'msg' property. For example 'msg.temperature < 10;'" + - "Message metadata can be accessed via 'meta' property. For example 'meta.customerName === 'John';'") + "If True - send Message via True chain, otherwise False chain is used." + + "Message payload can be accessed via msg property. For example msg.temperature < 10;" + + "Message metadata can be accessed via meta property. For example meta.customerName === 'John';") public class TbJsFilterNode implements TbNode { private TbJsFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index dff214567d..faf97b4e50 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; @@ -27,12 +28,14 @@ import java.util.Set; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j -@FilterNode(name = "switch", customRelations = true, +@RuleNode( + type = ComponentType.FILTER, + name = "switch", customRelations = true, nodeDescription = "Route incoming Message to one or multiple output chains", nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + "If Array is empty - message not routed to next Node. " + - "Message payload can be accessed via 'msg' property. For example 'msg.temperature < 10;' " + - "Message metadata can be accessed via 'meta' property. For example 'meta.customerName === 'John';' ") + "Message payload can be accessed via msg property. For example msg.temperature < 10; " + + "Message metadata can be accessed via meta property. For example meta.customerName === 'John';") public class TbJsSwitchNode implements TbNode { private TbJsSwitchNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index c08c3e0bf5..7a6f9fdbee 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -18,16 +18,19 @@ package org.thingsboard.rule.engine.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; /** * Created by ashvayka on 19.01.18. */ @Slf4j -@FilterNode(name = "message type", +@RuleNode( + type = ComponentType.FILTER, + name = "message type", nodeDescription = "Filter incoming messages by Message Type", nodeDetails = "Evaluate incoming Message with configured JS condition. " + - "If incoming MessageType is expected - send Message via 'Success' chain, otherwise 'Failure' chain is used.") + "If incoming MessageType is expected - send Message via Success chain, otherwise Failure chain is used.") public class TbMsgTypeFilterNode implements TbNode { TbMsgTypeFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 216cf28015..6228206da8 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -24,6 +24,7 @@ import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import java.util.List; @@ -35,11 +36,12 @@ import static org.thingsboard.server.common.data.DataConstants.*; * Created by ashvayka on 19.01.18. */ @Slf4j -@EnrichmentNode(name = "originator attributes", - nodeDescription = "Add Message Originator Attributes or Latest Telemetry into Message Metadata", - nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + - "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + - "'meta.cs.temperature' or 'meta.shared.limit' " + +@RuleNode(type = ComponentType.ENRICHMENT, + name = "originator attributes", + nodeDescription = "Add Message Originator Attributes or Latest Telemetry into Message Metadata", + nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + + "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + + "meta.cs.temperature or meta.shared.limit " + "If Latest Telemetry enrichment configured, latest telemetry added into metadata without prefix.") public class TbGetAttributesNode implements TbNode { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index c9cabaaabc..d85fb56de0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -16,17 +16,20 @@ package org.thingsboard.rule.engine.metadata; import com.google.common.util.concurrent.ListenableFuture; -import org.thingsboard.rule.engine.api.EnrichmentNode; +import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.plugin.ComponentType; -@EnrichmentNode(name="customer attributes", +@RuleNode( + type = ComponentType.ENRICHMENT, + name="customer attributes", nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index f85d019b04..26b756176c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -17,22 +17,21 @@ package org.thingsboard.rule.engine.metadata; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.api.TbNodeState; -import org.thingsboard.rule.engine.api.EnrichmentNode; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.plugin.ComponentType; -@EnrichmentNode(name="related attributes", +@RuleNode( + type = ComponentType.ENRICHMENT, + name="related attributes", nodeDescription = "Add Originators Related Entity Attributes or Latest Telemetry into Message Metadata", nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + "If multiple Related Entities are found, only first Entity is used for attributes enrichment, other entities are discarded. " + "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index 2603bc5cc1..7d9c50bfc6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -17,18 +17,21 @@ package org.thingsboard.rule.engine.metadata; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.rule.engine.api.EnrichmentNode; +import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.plugin.ComponentType; @Slf4j -@EnrichmentNode(name="tenant attributes", +@RuleNode( + type = ComponentType.ENRICHMENT, + name="tenant attributes", nodeDescription = "Add Originators Tenant Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "'meta.temperature'. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index 8ab8e18abc..d237df83ce 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -27,12 +27,15 @@ import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader; import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import java.util.HashSet; @Slf4j -@TransformationNode(name="change originator", +@RuleNode( + type = ComponentType.TRANSFORMATION, + name="change originator", nodeDescription = "Change Message Originator To Tenant/Customer/Related Entity", nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ") diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index 3cd7cd1374..babdbc3085 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -19,15 +19,18 @@ import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import javax.script.Bindings; -@TransformationNode(name = "script", +@RuleNode( + type = ComponentType.TRANSFORMATION, + name = "script", nodeDescription = "Change Message payload and Metadata using JavaScript", - nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside. " + - "'meta' - is a Message metadata. " + - "'msg' - is a Message payload. Any properties can be changed/removed/added in those objects.") + nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside.
" + + "meta - is a Message metadata.
" + + "msg - is a Message payload.
Any properties can be changed/removed/added in those objects.") public class TbTransformMsgNode extends TbAbstractTransformNode { private TbTransformMsgNodeConfiguration config; diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 2f8d152029..4dd961a11f 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -460,8 +460,19 @@ export default angular.module('thingsboard.types', []) ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION"], ruleChainNodeComponent: { type: 'RULE_CHAIN', - name: 'Rule chain', - clazz: 'tb.internal.RuleChain' + name: 'rule chain', + clazz: 'tb.internal.RuleChain', + configurationDescriptor: { + nodeDefinition: { + description: "Forwards incoming messages to specified Rule Chain", + details: "Forwards incoming messages to specified Rule Chain", + inEnabled: true, + outEnabled: false, + relationTypes: [], + customRelations: false, + defaultConfiguration: {} + } + } }, inputNodeComponent: { type: 'INPUT', diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 76d0fec0c5..973618de6b 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -183,7 +183,8 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, '
' + '
' + '
' + node.component.name + '
' + - '
' + 'Some description of node' + '
' + + '
' + node.component.configurationDescriptor.nodeDefinition.description + '
' + + '
' + node.component.configurationDescriptor.nodeDefinition.details + '
' + '
' + '
' ); diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index 258e232ea4..26a5225a68 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -260,3 +260,32 @@ stroke-dashoffset: 500; } } + +.tb-rule-node-tooltip { + font-size: 14px; + width: 300px; + color: #333; + #tooltip-content { + .tb-node-title { + font-weight: 600; + } + .tb-node-description { + font-style: italic; + color: #555; + } + .tb-node-details { + padding-top: 10px; + padding-bottom: 10px; + } + code { + padding: 0px 3px 2px 3px; + margin: 1px; + color: #AD1625; + white-space: nowrap; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; + border-radius: 2px; + font-size: 12px; + } + } +} \ No newline at end of file From 73473e3bebf1b62a26558ce30ba3ab4f9801a3a4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 22 Mar 2018 13:48:46 +0200 Subject: [PATCH 26/75] Rule Chain: Update tooltip messages --- ui/src/app/common/types.constant.js | 7 ++++++- ui/src/app/locale/locale.constant.js | 7 ++++++- ui/src/app/rulechain/rulechain.controller.js | 8 +++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 4dd961a11f..8026115b35 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -464,7 +464,7 @@ export default angular.module('thingsboard.types', []) clazz: 'tb.internal.RuleChain', configurationDescriptor: { nodeDefinition: { - description: "Forwards incoming messages to specified Rule Chain", + description: "", details: "Forwards incoming messages to specified Rule Chain", inEnabled: true, outEnabled: false, @@ -483,30 +483,35 @@ export default angular.module('thingsboard.types', []) FILTER: { value: "FILTER", name: "rulenode.type-filter", + details: "rulenode.type-filter-details", nodeClass: "tb-filter-type", icon: "filter_list" }, ENRICHMENT: { value: "ENRICHMENT", name: "rulenode.type-enrichment", + details: "rulenode.type-enrichment-details", nodeClass: "tb-enrichment-type", icon: "playlist_add" }, TRANSFORMATION: { value: "TRANSFORMATION", name: "rulenode.type-transformation", + details: "rulenode.type-transformation-details", nodeClass: "tb-transformation-type", icon: "transform" }, ACTION: { value: "ACTION", name: "rulenode.type-action", + details: "rulenode.type-action-details", nodeClass: "tb-action-type", icon: "flash_on" }, RULE_CHAIN: { value: "RULE_CHAIN", name: "rulenode.type-rule-chain", + details: "rulenode.type-rule-chain-details", nodeClass: "tb-rule-chain-type", icon: "settings_ethernet" }, diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 18c9330165..360c8282ac 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1186,10 +1186,15 @@ export default angular.module('thingsboard.locale', []) "custom-link-label": "Custom link label", "custom-link-label-required": "Custom link label is required.", "type-filter": "Filter", + "type-filter-details": "Filter incoming messages with configured conditions", "type-enrichment": "Enrichment", + "type-enrichment-details": "Add additional information into Message Metadata", "type-transformation": "Transformation", + "type-transformation-details": "Change Message payload and Metadata", "type-action": "Action", - "type-rule-chain": "Rule Chain" + "type-action-details": "Perform special action", + "type-rule-chain": "Rule Chain", + "type-rule-chain-details": "Forwards incoming messages to specified Rule Chain" }, "rule-plugin": { "management": "Rules and plugins management" diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 973618de6b..d9bbf2fd8d 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -34,7 +34,8 @@ const aKeyCode = 65; const escKeyCode = 27; /*@ngInject*/ -export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, $timeout, $mdExpansionPanel, $document, $mdDialog, $filter, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { +export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, $timeout, $mdExpansionPanel, $document, $mdDialog, + $filter, $translate, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { var vm = this; @@ -155,11 +156,12 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }; vm.typeHeaderMouseEnter = function(event, typeId) { + var ruleNodeType = types.ruleNodeType[typeId]; displayTooltip(event, '
' + '
' + - '
' + typeId + '
' + - '
' + 'Some description of component type' + '
' + + '
' + $translate.instant(ruleNodeType.name) + '
' + + '
' + $translate.instant(ruleNodeType.details) + '
' + '
' + '
' ); From adb71ecfe7b2a87e372d207837c769017f49d18a Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 23 Mar 2018 10:41:29 +0200 Subject: [PATCH 27/75] Rule Node Configuration --- .../AnnotationComponentDiscoveryService.java | 9 +- .../src/main/resources/thingsboard.yml | 2 +- .../rule/engine/api/NodeConfiguration.java | 22 +++ .../thingsboard/rule/engine/api/RuleNode.java | 5 +- .../src/main/resources/EmptyNodeConfig.json | 2 - .../main/resources/EmptyNodeDescriptor.json | 2 - .../rule/engine/filter/TbJsFilterNode.java | 1 + .../filter/TbJsFilterNodeConfiguration.java | 10 +- .../rule/engine/filter/TbJsSwitchNode.java | 1 + .../filter/TbJsSwitchNodeConfiguration.java | 17 +- .../engine/filter/TbMsgTypeFilterNode.java | 1 + .../TbMsgTypeFilterNodeConfiguration.java | 11 +- .../engine/metadata/TbGetAttributesNode.java | 1 + .../TbGetAttributesNodeConfiguration.java | 13 +- .../metadata/TbGetCustomerAttributeNode.java | 1 + .../TbGetEntityAttrNodeConfiguration.java | 14 +- .../TbGetRelatedAttrNodeConfiguration.java | 19 +- .../metadata/TbGetRelatedAttributeNode.java | 1 + .../metadata/TbGetTenantAttributeNode.java | 1 + .../transform/TbChangeOriginatorNode.java | 1 + .../TbChangeOriginatorNodeConfiguration.java | 14 +- .../engine/transform/TbTransformMsgNode.java | 1 + .../TbTransformMsgNodeConfiguration.java | 11 +- ui/src/app/api/rule-chain.service.js | 25 +-- .../components/json-object-edit.directive.js | 165 ++++++++++++++++++ ui/src/app/components/json-object-edit.scss | 35 ++++ .../app/components/json-object-edit.tpl.html | 34 ++++ ui/src/app/layout/index.js | 4 +- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 82 ++++----- .../app/rulechain/rulenode-fieldset.tpl.html | 5 + ui/src/app/rulechain/rulenode.directive.js | 2 + ui/src/app/rulechain/rulenode.scss | 22 +++ ui/src/app/rulechain/rulenode.tpl.html | 2 +- ui/src/scss/main.scss | 18 ++ 35 files changed, 483 insertions(+), 72 deletions(-) create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java delete mode 100644 rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json delete mode 100644 rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json create mode 100644 ui/src/app/components/json-object-edit.directive.js create mode 100644 ui/src/app/components/json-object-edit.scss create mode 100644 ui/src/app/components/json-object-edit.tpl.html create mode 100644 ui/src/app/rulechain/rulenode.scss diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java index 52d7d7d80c..479f424e93 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java @@ -180,7 +180,7 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe return scannedComponent; } - private NodeDefinition prepareNodeDefinition(RuleNode nodeAnnotation) throws IOException { + private NodeDefinition prepareNodeDefinition(RuleNode nodeAnnotation) throws Exception { NodeDefinition nodeDefinition = new NodeDefinition(); nodeDefinition.setDetails(nodeAnnotation.nodeDetails()); nodeDefinition.setDescription(nodeAnnotation.nodeDescription()); @@ -188,9 +188,10 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe nodeDefinition.setOutEnabled(nodeAnnotation.outEnabled()); nodeDefinition.setRelationTypes(nodeAnnotation.relationTypes()); nodeDefinition.setCustomRelations(nodeAnnotation.customRelations()); - String defaultConfigResourceName = nodeAnnotation.defaultConfigResource(); - nodeDefinition.setDefaultConfiguration(mapper.readTree( - Resources.toString(Resources.getResource(defaultConfigResourceName), Charsets.UTF_8))); + Class configClazz = nodeAnnotation.configClazz(); + NodeConfiguration config = configClazz.newInstance(); + NodeConfiguration defaultConfiguration = config.defaultConfiguration(); + nodeDefinition.setDefaultConfiguration(mapper.valueToTree(defaultConfiguration)); return nodeDefinition; } diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 27585212db..1df2f1cf31 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -234,7 +234,7 @@ caffeine: specs: relations: timeToLiveInMinutes: 1440 - maxSize: 100000 + maxSize: 0 deviceCredentials: timeToLiveInMinutes: 1440 maxSize: 100000 diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java new file mode 100644 index 0000000000..5e4c4b5399 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java @@ -0,0 +1,22 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +public interface NodeConfiguration { + + NodeConfiguration defaultConfiguration(); + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java index f8e0fa2e29..16170347a7 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java @@ -35,15 +35,16 @@ public @interface RuleNode { String nodeDetails(); + Class configClazz(); + boolean inEnabled() default true; boolean outEnabled() default true; ComponentScope scope() default ComponentScope.TENANT; - String defaultConfigResource() default "EmptyNodeConfig.json"; - String[] relationTypes() default {"Success", "Failure"}; boolean customRelations() default false; + } diff --git a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json deleted file mode 100644 index 7a73a41bfd..0000000000 --- a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeConfig.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json b/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json deleted file mode 100644 index 7a73a41bfd..0000000000 --- a/rule-engine/rule-engine-api/src/main/resources/EmptyNodeDescriptor.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index c85d4807e0..07b166db68 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -30,6 +30,7 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @RuleNode( type = ComponentType.FILTER, name = "script", relationTypes = {"True", "False", "Failure"}, + configClazz = TbJsFilterNodeConfiguration.class, nodeDescription = "Filter incoming messages using JS script", nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If True - send Message via True chain, otherwise False chain is used." + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java index bf543e3276..3b19c7c641 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java @@ -16,9 +16,17 @@ package org.thingsboard.rule.engine.filter; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; @Data -public class TbJsFilterNodeConfiguration { +public class TbJsFilterNodeConfiguration implements NodeConfiguration { private String jsScript; + + @Override + public TbJsFilterNodeConfiguration defaultConfiguration() { + TbJsFilterNodeConfiguration configuration = new TbJsFilterNodeConfiguration(); + configuration.setJsScript("msg.passed < 15 && msg.name === 'Vit' && meta.temp == 10 && msg.bigObj.prop == 42;"); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index faf97b4e50..c1236a4653 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -31,6 +31,7 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @RuleNode( type = ComponentType.FILTER, name = "switch", customRelations = true, + configClazz = TbJsSwitchNodeConfiguration.class, nodeDescription = "Route incoming Message to one or multiple output chains", nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + "If Array is empty - message not routed to next Node. " + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java index 331302d542..b354c7199f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -15,14 +15,29 @@ */ package org.thingsboard.rule.engine.filter; +import com.google.common.collect.Sets; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; import java.util.Set; @Data -public class TbJsSwitchNodeConfiguration { +public class TbJsSwitchNodeConfiguration implements NodeConfiguration { private String jsScript; private Set allowedRelations; private boolean routeToAllWithNoCheck; + + @Override + public TbJsSwitchNodeConfiguration defaultConfiguration() { + TbJsSwitchNodeConfiguration configuration = new TbJsSwitchNodeConfiguration(); + configuration.setJsScript("function nextRelation(meta, msg) {\n" + + " return ['one','nine'];" + + "};\n" + + "\n" + + "nextRelation(meta, msg);"); + configuration.setAllowedRelations(Sets.newHashSet("one", "two")); + configuration.setRouteToAllWithNoCheck(false); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index 7a6f9fdbee..3a86c25afb 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -28,6 +28,7 @@ import org.thingsboard.server.common.msg.TbMsg; @RuleNode( type = ComponentType.FILTER, name = "message type", + configClazz = TbMsgTypeFilterNodeConfiguration.class, nodeDescription = "Filter incoming messages by Message Type", nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If incoming MessageType is expected - send Message via Success chain, otherwise Failure chain is used.") diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java index 3b7ba9055e..a2e1b179f0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java @@ -16,15 +16,24 @@ package org.thingsboard.rule.engine.filter; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import java.util.Arrays; +import java.util.Collections; import java.util.List; /** * Created by ashvayka on 19.01.18. */ @Data -public class TbMsgTypeFilterNodeConfiguration { +public class TbMsgTypeFilterNodeConfiguration implements NodeConfiguration { private List messageTypes; + @Override + public TbMsgTypeFilterNodeConfiguration defaultConfiguration() { + TbMsgTypeFilterNodeConfiguration configuration = new TbMsgTypeFilterNodeConfiguration(); + configuration.setMessageTypes(Arrays.asList("GET_ATTRIBUTES","POST_ATTRIBUTES","POST_TELEMETRY","RPC_REQUEST")); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 6228206da8..69ee9d7c79 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -38,6 +38,7 @@ import static org.thingsboard.server.common.data.DataConstants.*; @Slf4j @RuleNode(type = ComponentType.ENRICHMENT, name = "originator attributes", + configClazz = TbGetAttributesNodeConfiguration.class, nodeDescription = "Add Message Originator Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java index ad92314324..103b4de956 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java @@ -16,14 +16,16 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import java.util.Collections; import java.util.List; /** * Created by ashvayka on 19.01.18. */ @Data -public class TbGetAttributesNodeConfiguration { +public class TbGetAttributesNodeConfiguration implements NodeConfiguration { private List clientAttributeNames; private List sharedAttributeNames; @@ -31,4 +33,13 @@ public class TbGetAttributesNodeConfiguration { private List latestTsKeyNames; + @Override + public TbGetAttributesNodeConfiguration defaultConfiguration() { + TbGetAttributesNodeConfiguration configuration = new TbGetAttributesNodeConfiguration(); + configuration.setClientAttributeNames(Collections.emptyList()); + configuration.setSharedAttributeNames(Collections.emptyList()); + configuration.setServerAttributeNames(Collections.emptyList()); + configuration.setLatestTsKeyNames(Collections.emptyList()); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index d85fb56de0..cc6d6a1197 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; @RuleNode( type = ComponentType.ENRICHMENT, name="customer attributes", + configClazz = TbGetEntityAttrNodeConfiguration.class, nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java index a5e85c57d7..51951150af 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java @@ -16,13 +16,25 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import java.util.HashMap; import java.util.Map; import java.util.Optional; @Data -public class TbGetEntityAttrNodeConfiguration { +public class TbGetEntityAttrNodeConfiguration implements NodeConfiguration { private Map attrMapping; private boolean isTelemetry = false; + + @Override + public TbGetEntityAttrNodeConfiguration defaultConfiguration() { + TbGetEntityAttrNodeConfiguration configuration = new TbGetEntityAttrNodeConfiguration(); + Map attrMapping = new HashMap<>(); + attrMapping.putIfAbsent("temperature", "tempo"); + configuration.setAttrMapping(attrMapping); + configuration.setTelemetry(true); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java index ae0b662d48..82119926af 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java @@ -16,11 +16,28 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import java.util.HashMap; +import java.util.Map; + @Data -public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfiguration { +public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfiguration { private String relationType; private EntitySearchDirection direction; + + @Override + public TbGetRelatedAttrNodeConfiguration defaultConfiguration() { + TbGetRelatedAttrNodeConfiguration configuration = new TbGetRelatedAttrNodeConfiguration(); + Map attrMapping = new HashMap<>(); + attrMapping.putIfAbsent("temperature", "tempo"); + configuration.setAttrMapping(attrMapping); + configuration.setTelemetry(true); + configuration.setRelationType(EntityRelation.CONTAINS_TYPE); + configuration.setDirection(EntitySearchDirection.FROM); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 26b756176c..22c0b9f0a8 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; @RuleNode( type = ComponentType.ENRICHMENT, name="related attributes", + configClazz = TbGetRelatedAttrNodeConfiguration.class, nodeDescription = "Add Originators Related Entity Attributes or Latest Telemetry into Message Metadata", nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + "If multiple Related Entities are found, only first Entity is used for attributes enrichment, other entities are discarded. " + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index 7d9c50bfc6..b5f5e02dbe 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; @RuleNode( type = ComponentType.ENRICHMENT, name="tenant attributes", + configClazz = TbGetEntityAttrNodeConfiguration.class, nodeDescription = "Add Originators Tenant Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index d237df83ce..40a647a822 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -36,6 +36,7 @@ import java.util.HashSet; @RuleNode( type = ComponentType.TRANSFORMATION, name="change originator", + configClazz = TbChangeOriginatorNodeConfiguration.class, nodeDescription = "Change Message Originator To Tenant/Customer/Related Entity", nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ") diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java index cf036810c4..3370408231 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java @@ -16,12 +16,24 @@ package org.thingsboard.rule.engine.transform; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; @Data -public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfiguration{ +public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfiguration implements NodeConfiguration { private String originatorSource; private EntitySearchDirection direction; private String relationType; + + @Override + public TbChangeOriginatorNodeConfiguration defaultConfiguration() { + TbChangeOriginatorNodeConfiguration configuration = new TbChangeOriginatorNodeConfiguration(); + configuration.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE); + configuration.setDirection(EntitySearchDirection.FROM); + configuration.setRelationType(EntityRelation.CONTAINS_TYPE); + configuration.setStartNewChain(false); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index babdbc3085..626790fcf8 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -27,6 +27,7 @@ import javax.script.Bindings; @RuleNode( type = ComponentType.TRANSFORMATION, name = "script", + configClazz = TbTransformMsgNodeConfiguration.class, nodeDescription = "Change Message payload and Metadata using JavaScript", nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside.
" + "meta - is a Message metadata.
" + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java index 9cc926b54d..4f9e9eb681 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java @@ -16,9 +16,18 @@ package org.thingsboard.rule.engine.transform; import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; @Data -public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguration { +public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguration implements NodeConfiguration { private String jsScript; + + @Override + public TbTransformMsgNodeConfiguration defaultConfiguration() { + TbTransformMsgNodeConfiguration configuration = new TbTransformMsgNodeConfiguration(); + configuration.setStartNewChain(false); + configuration.setJsScript("msg.passed = msg.passed * meta.temp; msg.bigObj.newProp = 'Ukraine' "); + return configuration; + } } diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index f17553545e..ebc48fad61 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -153,16 +153,21 @@ function RuleChainService($http, $q, $filter, types, componentDescriptorService) return deferred.promise; } - function getRuleNodeSupportedLinks(nodeType) { //eslint-disable-line - //TODO: - var deferred = $q.defer(); - var linkLabels = [ - { name: 'Success', custom: false }, - { name: 'Fail', custom: false }, - { name: 'Custom', custom: true }, - ]; - deferred.resolve(linkLabels); - return deferred.promise; + function getRuleNodeSupportedLinks(component) { + var relationTypes = component.configurationDescriptor.nodeDefinition.relationTypes; + var customRelations = component.configurationDescriptor.nodeDefinition.customRelations; + var linkLabels = []; + for (var i=0;i +
+
+ + + +
+
+
+
+
+
diff --git a/ui/src/app/layout/index.js b/ui/src/app/layout/index.js index e90334bf52..d397d142c8 100644 --- a/ui/src/app/layout/index.js +++ b/ui/src/app/layout/index.js @@ -29,6 +29,7 @@ import thingsboardNoAnimate from '../components/no-animate.directive'; import thingsboardOnFinishRender from '../components/finish-render.directive'; import thingsboardSideMenu from '../components/side-menu.directive'; import thingsboardDashboardAutocomplete from '../components/dashboard-autocomplete.directive'; +import thingsboardJsonObjectEdit from '../components/json-object-edit.directive'; import thingsboardUserMenu from './user-menu.directive'; @@ -90,7 +91,8 @@ export default angular.module('thingsboard.home', [ thingsboardNoAnimate, thingsboardOnFinishRender, thingsboardSideMenu, - thingsboardDashboardAutocomplete + thingsboardDashboardAutocomplete, + thingsboardJsonObjectEdit ]) .config(HomeRoutes) .controller('HomeController', HomeController) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 360c8282ac..cca2a11648 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1179,6 +1179,7 @@ export default angular.module('thingsboard.locale', []) "delete": "Delete rule node", "rulenode-details": "Rule node details", "debug-mode": "Debug mode", + "configuration": "Configuration", "link-details": "Rule node link details", "add-link": "Add link", "link-label": "Link label", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index d9bbf2fd8d..b792f138f8 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -151,6 +151,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }, 'mouseLeave': function () { destroyTooltips(); + }, + 'mouseDown': function () { + destroyTooltips(); } } }; @@ -226,16 +229,12 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, edgeDoubleClick: function (event, edge) { var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); if (sourceNode.component.type != types.ruleNodeType.INPUT.value) { - ruleChainService.getRuleNodeSupportedLinks(sourceNode.component.clazz).then( - (labels) => { - vm.isEditingRuleNode = false; - vm.editingRuleNode = null; - vm.editingRuleNodeLinkLabels = labels; - vm.isEditingRuleNodeLink = true; - vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); - vm.editingRuleNodeLink = angular.copy(edge); - } - ); + vm.isEditingRuleNode = false; + vm.editingRuleNode = null; + vm.editingRuleNodeLinkLabels = ruleChainService.getRuleNodeSupportedLinks(sourceNode.component); + vm.isEditingRuleNodeLink = true; + vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); + vm.editingRuleNodeLink = angular.copy(edge); } }, nodeCallbacks: { @@ -267,16 +266,10 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, deferred.resolve(edge); } } else { - ruleChainService.getRuleNodeSupportedLinks(sourceNode.component.clazz).then( - (labels) => { - addRuleNodeLink(event, edge, labels).then( - (link) => { - deferred.resolve(link); - }, - () => { - deferred.reject(); - } - ); + var labels = ruleChainService.getRuleNodeSupportedLinks(sourceNode.component); + addRuleNodeLink(event, edge, labels).then( + (link) => { + deferred.resolve(link); }, () => { deferred.reject(); @@ -309,24 +302,19 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, y: 10+50*model.nodes.length, connectors: [] }; - if (componentType == types.ruleNodeType.RULE_CHAIN.value) { - node.connectors.push( - { - type: flowchartConstants.leftConnectorType, - id: model.nodes.length - } - ); - } else { + if (ruleNodeComponent.configurationDescriptor.nodeDefinition.inEnabled) { node.connectors.push( { type: flowchartConstants.leftConnectorType, - id: model.nodes.length*2 + id: model.nodes.length * 2 } ); + } + if (ruleNodeComponent.configurationDescriptor.nodeDefinition.outEnabled) { node.connectors.push( { type: flowchartConstants.rightConnectorType, - id: model.nodes.length*2+1 + id: model.nodes.length * 2 + 1 } ); } @@ -398,17 +386,24 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, name: ruleNode.name, nodeClass: vm.types.ruleNodeType[component.type].nodeClass, icon: vm.types.ruleNodeType[component.type].icon, - connectors: [ + connectors: [] + }; + if (component.configurationDescriptor.nodeDefinition.inEnabled) { + node.connectors.push( { type: flowchartConstants.leftConnectorType, id: vm.nextConnectorID++ - }, + } + ); + } + if (component.configurationDescriptor.nodeDefinition.outEnabled) { + node.connectors.push( { type: flowchartConstants.rightConnectorType, id: vm.nextConnectorID++ } - ] - }; + ); + } nodes.push(node); vm.ruleChainModel.nodes.push(node); } @@ -590,6 +585,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } function addRuleNode($event, ruleNode) { + + ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration); + $mdDialog.show({ controller: 'AddRuleNodeController', controllerAs: 'vm', @@ -601,13 +599,15 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }).then(function (ruleNode) { ruleNode.id = vm.nextNodeID++; ruleNode.connectors = []; - ruleNode.connectors.push( - { - id: vm.nextConnectorID++, - type: flowchartConstants.leftConnectorType - } - ); - if (ruleNode.component.type != types.ruleNodeType.RULE_CHAIN.value) { + if (ruleNode.component.configurationDescriptor.nodeDefinition.inEnabled) { + ruleNode.connectors.push( + { + id: vm.nextConnectorID++, + type: flowchartConstants.leftConnectorType + } + ); + } + if (ruleNode.component.configurationDescriptor.nodeDefinition.outEnabled) { ruleNode.connectors.push( { id: vm.nextConnectorID++, diff --git a/ui/src/app/rulechain/rulenode-fieldset.tpl.html b/ui/src/app/rulechain/rulenode-fieldset.tpl.html index 0d16e45405..30cf0752cd 100644 --- a/ui/src/app/rulechain/rulenode-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulenode-fieldset.tpl.html @@ -38,6 +38,11 @@ ng-model="ruleNode.debugMode">{{ 'rulenode.debug-mode' | translate }} + + diff --git a/ui/src/app/rulechain/rulenode.directive.js b/ui/src/app/rulechain/rulenode.directive.js index 998e9981c6..be3e9c36b5 100644 --- a/ui/src/app/rulechain/rulenode.directive.js +++ b/ui/src/app/rulechain/rulenode.directive.js @@ -14,6 +14,8 @@ * limitations under the License. */ +import './rulenode.scss'; + /* eslint-disable import/no-unresolved, import/default */ import ruleNodeFieldsetTemplate from './rulenode-fieldset.tpl.html'; diff --git a/ui/src/app/rulechain/rulenode.scss b/ui/src/app/rulechain/rulenode.scss new file mode 100644 index 0000000000..febc637a37 --- /dev/null +++ b/ui/src/app/rulechain/rulenode.scss @@ -0,0 +1,22 @@ +/** + * Copyright © 2016-2018 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. + */ + +.tb-rulenode { + tb-json-object-edit.tb-rule-node-configuration-json { + height: 300px; + display: block; + } +} \ No newline at end of file diff --git a/ui/src/app/rulechain/rulenode.tpl.html b/ui/src/app/rulechain/rulenode.tpl.html index 5a521a8333..ffc8a0f20d 100644 --- a/ui/src/app/rulechain/rulenode.tpl.html +++ b/ui/src/app/rulechain/rulenode.tpl.html @@ -19,7 +19,7 @@ id="{{node.id}}" ng-attr-style="position: absolute; top: {{ node.y }}px; left: {{ node.x }}px;" ng-dblclick="callbacks.doubleClick($event, node)" - ng-mouseover="callbacks.mouseOver($event, node)" + ng-mousedown="callbacks.mouseDown($event, node)" ng-mouseenter="callbacks.mouseEnter($event, node)" ng-mouseleave="callbacks.mouseLeave($event, node)">
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss index 93ff3205c0..6aa662c58c 100644 --- a/ui/src/scss/main.scss +++ b/ui/src/scss/main.scss @@ -203,6 +203,12 @@ md-sidenav { * THINGSBOARD SPECIFIC ***********************/ +$swift-ease-out-duration: 0.4s !default; +$swift-ease-out-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default; + +$input-label-float-offset: 6px !default; +$input-label-float-scale: 0.75 !default; + label { &.tb-title { pointer-events: none; @@ -213,6 +219,18 @@ label { &.no-padding { padding-bottom: 0px; } + &.tb-required:after { + content: ' *'; + font-size: 13px; + vertical-align: top; + color: rgba(0,0,0,0.54); + } + &.tb-error { + color: rgb(221,44,0); + &.tb-required:after { + color: rgb(221,44,0); + } + } } } From 1776aadbec41b1ad93dacf5eb08fbd58ea92f9af Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Fri, 23 Mar 2018 13:32:08 +0200 Subject: [PATCH 28/75] cassandra rate limit clear latest telemetry cleare rule-plugin cache --- .../server/ThingsboardServerApplication.java | 2 + .../plugin/PluginActorMessageProcessor.java | 19 ++- .../rule/RuleActorMessageProcessor.java | 41 +++-- .../src/main/resources/thingsboard.yml | 8 +- .../server/dao/asset/CassandraAssetDao.java | 2 +- .../CassandraBaseAttributesDao.java | 4 +- .../dao/audit/CassandraAuditLogDao.java | 6 +- .../CassandraBaseComponentDescriptorDao.java | 4 +- .../server/dao/device/CassandraDeviceDao.java | 2 +- .../dao/nosql/CassandraAbstractDao.java | 17 +- .../dao/nosql/CassandraAbstractModelDao.java | 10 +- .../dao/nosql/RateLimitedResultSetFuture.java | 148 ++++++++++++++++ .../server/dao/relation/BaseRelationDao.java | 16 +- .../CassandraBaseTimeseriesDao.java | 55 +++--- .../server/dao/util/AsyncRateLimiter.java | 25 +++ .../server/dao/util/BufferedRateLimiter.java | 160 ++++++++++++++++++ .../nosql/RateLimitedResultSetFutureTest.java | 156 +++++++++++++++++ .../dao/util/BufferedRateLimiterTest.java | 134 +++++++++++++++ 18 files changed, 737 insertions(+), 72 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/AsyncRateLimiter.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java index c3444d43f7..751bde6303 100644 --- a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java +++ b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java @@ -19,6 +19,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.Arrays; @@ -26,6 +27,7 @@ import java.util.Arrays; @SpringBootConfiguration @EnableAsync @EnableSwagger2 +@EnableScheduling @ComponentScan({"org.thingsboard.server"}) public class ThingsboardServerApplication { diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java index 6e78e20521..7dfe9a5d81 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java @@ -28,9 +28,14 @@ import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; +import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; +import org.thingsboard.server.common.msg.session.MsgType; import org.thingsboard.server.extensions.api.plugins.Plugin; import org.thingsboard.server.extensions.api.plugins.PluginInitializationException; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.ResponsePluginToRuleMsg; +import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; @@ -98,7 +103,19 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor public void onRuleToPluginMsg(RuleToPluginMsgWrapper msg) throws RuleException { if (state == ComponentLifecycleState.ACTIVE) { - pluginImpl.process(trustedCtx, msg.getRuleTenantId(), msg.getRuleId(), msg.getMsg()); + try { + pluginImpl.process(trustedCtx, msg.getRuleTenantId(), msg.getRuleId(), msg.getMsg()); + } catch (Exception ex) { + RuleToPluginMsg ruleMsg = msg.getMsg(); + MsgType responceMsgType = MsgType.RULE_ENGINE_ERROR; + Integer requestId = 0; + if (ruleMsg.getPayload() instanceof FromDeviceRequestMsg) { + requestId = ((FromDeviceRequestMsg) ruleMsg.getPayload()).getRequestId(); + } + trustedCtx.reply( + new ResponsePluginToRuleMsg(ruleMsg.getUid(), tenantId, msg.getRuleId(), + BasicStatusCodeResponse.onError(responceMsgType, requestId, ex))); + } } else { //TODO: reply with plugin suspended message } diff --git a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java index 2ebebfca33..fd84fe978f 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/rule/RuleActorMessageProcessor.java @@ -15,8 +15,9 @@ */ package org.thingsboard.server.actors.rule; -import java.util.*; - +import akka.actor.ActorContext; +import akka.actor.ActorRef; +import akka.event.LoggingAdapter; import com.fasterxml.jackson.core.JsonProcessingException; import org.springframework.util.StringUtils; import org.thingsboard.server.actors.ActorSystemContext; @@ -29,23 +30,17 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.core.BasicRequest; import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; import org.thingsboard.server.common.msg.core.RuleEngineError; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.common.msg.session.MsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; -import org.thingsboard.server.common.msg.session.ex.ProcessingTimeoutException; -import org.thingsboard.server.extensions.api.rules.*; import org.thingsboard.server.extensions.api.plugins.PluginAction; import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg; +import org.thingsboard.server.extensions.api.plugins.msg.ResponsePluginToRuleMsg; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; +import org.thingsboard.server.extensions.api.rules.*; -import com.fasterxml.jackson.databind.JsonNode; - -import akka.actor.ActorContext; -import akka.actor.ActorRef; -import akka.event.LoggingAdapter; +import java.util.*; class RuleActorMessageProcessor extends ComponentMsgProcessor { @@ -190,18 +185,32 @@ class RuleActorMessageProcessor extends ComponentMsgProcessor { RuleProcessingMsg pendingMsg = pendingMsgMap.remove(msg.getUid()); if (pendingMsg != null) { ChainProcessingContext ctx = pendingMsg.getCtx(); - Optional ruleResponseOptional = action.convert(msg); - if (ruleResponseOptional.isPresent()) { - ctx.mergeResponse(ruleResponseOptional.get()); - pushToNextRule(context, ctx, null); - } else { + if (isErrorResponce(msg)) { pushToNextRule(context, ctx, RuleEngineError.NO_RESPONSE_FROM_ACTIONS); + } else { + Optional ruleResponseOptional = action.convert(msg); + if (ruleResponseOptional.isPresent()) { + ctx.mergeResponse(ruleResponseOptional.get()); + pushToNextRule(context, ctx, null); + } else { + pushToNextRule(context, ctx, RuleEngineError.NO_RESPONSE_FROM_ACTIONS); + } } } else { logger.warning("[{}] Processing timeout detected: [{}]", entityId, msg.getUid()); } } + private boolean isErrorResponce(PluginToRuleMsg msg) { + if (msg instanceof ResponsePluginToRuleMsg) { + if (((ResponsePluginToRuleMsg) msg).getPayload() instanceof BasicStatusCodeResponse) { + BasicStatusCodeResponse responce = (BasicStatusCodeResponse) ((ResponsePluginToRuleMsg) msg).getPayload(); + return !responce.isSuccess(); + } + } + return false; + } + void onTimeoutMsg(ActorContext context, RuleToPluginTimeoutMsg msg) { RuleProcessingMsg pendingMsg = pendingMsgMap.remove(msg.getMsgId()); if (pendingMsg != null) { diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 77f06e92d3..07face1059 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -133,7 +133,7 @@ quota: intervalMin: 2 database: - type: "${DATABASE_TYPE:sql}" # cassandra OR sql + type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql # Cassandra driver configuration parameters cassandra: @@ -181,6 +181,10 @@ cassandra: default_fetch_size: "${CASSANDRA_DEFAULT_FETCH_SIZE:2000}" # Specify partitioning size for timestamp key-value storage. Example MINUTES, HOURS, DAYS, MONTHS ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}" + buffer_size: "${CASSANDRA_QUERY_BUFFER_SIZE:200000}" + concurrent_limit: "${CASSANDRA_QUERY_CONCURRENT_LIMIT:1000}" + permit_max_wait_time: "${PERMIT_MAX_WAIT_TIME:120000}" + rate_limit_print_interval_ms: "${CASSANDRA_QUERY_RATE_LIMIT_PRINT_MS:30000}" # SQL configuration parameters sql: @@ -222,7 +226,7 @@ caffeine: specs: relations: timeToLiveInMinutes: 1440 - maxSize: 100000 + maxSize: 0 deviceCredentials: timeToLiveInMinutes: 1440 maxSize: 100000 diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java index 4f923fe808..64ec718fdd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java @@ -148,7 +148,7 @@ public class CassandraAssetDao extends CassandraAbstractSearchTextDao>() { @Nullable @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index 932d6b9147..8ae9dc8ad4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java @@ -147,12 +147,12 @@ public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implem .and(eq(ATTRIBUTE_TYPE_COLUMN, attributeType)) .and(eq(ATTRIBUTE_KEY_COLUMN, key)); log.debug("Remove request: {}", delete.toString()); - return getFuture(getSession().executeAsync(delete), rs -> null); + return getFuture(executeAsyncWrite(delete), rs -> null); } private PreparedStatement getSaveStmt() { if (saveStmt == null) { - saveStmt = getSession().prepare("INSERT INTO " + ModelConstants.ATTRIBUTES_KV_CF + + saveStmt = prepare("INSERT INTO " + ModelConstants.ATTRIBUTES_KV_CF + "(" + ENTITY_TYPE_COLUMN + "," + ENTITY_ID_COLUMN + "," + ATTRIBUTE_TYPE_COLUMN + diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/CassandraAuditLogDao.java b/dao/src/main/java/org/thingsboard/server/dao/audit/CassandraAuditLogDao.java index 27f7adc669..fd02b5f880 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/audit/CassandraAuditLogDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/audit/CassandraAuditLogDao.java @@ -244,12 +244,12 @@ public class CassandraAuditLogDao extends CassandraAbstractSearchTimeDao>() { @Nullable @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java index 94299caeb4..5c93066d90 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java @@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.dao.cassandra.CassandraCluster; import org.thingsboard.server.dao.model.type.*; +import org.thingsboard.server.dao.util.BufferedRateLimiter; @Slf4j public abstract class CassandraAbstractDao { @@ -28,12 +29,15 @@ public abstract class CassandraAbstractDao { @Autowired protected CassandraCluster cluster; + @Autowired + private BufferedRateLimiter rateLimiter; + private Session session; private ConsistencyLevel defaultReadLevel; private ConsistencyLevel defaultWriteLevel; - protected Session getSession() { + private Session getSession() { if (session == null) { session = cluster.getSession(); defaultReadLevel = cluster.getDefaultReadConsistencyLevel(); @@ -50,6 +54,10 @@ public abstract class CassandraAbstractDao { return session; } + protected PreparedStatement prepare(String query) { + return getSession().prepare(query); + } + private void registerCodecIfNotFound(CodecRegistry registry, TypeCodec codec) { try { registry.codecFor(codec.getCqlType(), codec.getJavaType()); @@ -76,10 +84,7 @@ public abstract class CassandraAbstractDao { private ResultSet execute(Statement statement, ConsistencyLevel level) { log.debug("Execute cassandra statement {}", statement); - if (statement.getConsistencyLevel() == null) { - statement.setConsistencyLevel(level); - } - return getSession().execute(statement); + return executeAsync(statement, level).getUninterruptibly(); } private ResultSetFuture executeAsync(Statement statement, ConsistencyLevel level) { @@ -87,6 +92,6 @@ public abstract class CassandraAbstractDao { if (statement.getConsistencyLevel() == null) { statement.setConsistencyLevel(level); } - return getSession().executeAsync(statement); + return new RateLimitedResultSetFuture(getSession(), rateLimiter, statement); } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java index bad7b9e9b9..000316b4ff 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java @@ -60,7 +60,7 @@ public abstract class CassandraAbstractModelDao, D> exte List list = Collections.emptyList(); if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); - ResultSet resultSet = getSession().execute(statement); + ResultSet resultSet = executeRead(statement); Result result = getMapper().map(resultSet); if (result != null) { list = result.all(); @@ -72,7 +72,7 @@ public abstract class CassandraAbstractModelDao, D> exte protected ListenableFuture> findListByStatementAsync(Statement statement) { if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); - ResultSetFuture resultSetFuture = getSession().executeAsync(statement); + ResultSetFuture resultSetFuture = executeAsyncRead(statement); return Futures.transform(resultSetFuture, new Function>() { @Nullable @Override @@ -94,7 +94,7 @@ public abstract class CassandraAbstractModelDao, D> exte E object = null; if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); - ResultSet resultSet = getSession().execute(statement); + ResultSet resultSet = executeRead(statement); Result result = getMapper().map(resultSet); if (result != null) { object = result.one(); @@ -106,7 +106,7 @@ public abstract class CassandraAbstractModelDao, D> exte protected ListenableFuture findOneByStatementAsync(Statement statement) { if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); - ResultSetFuture resultSetFuture = getSession().executeAsync(statement); + ResultSetFuture resultSetFuture = executeAsyncRead(statement); return Futures.transform(resultSetFuture, new Function() { @Nullable @Override @@ -181,7 +181,7 @@ public abstract class CassandraAbstractModelDao, D> exte public boolean removeById(UUID key) { Statement delete = QueryBuilder.delete().all().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key)); log.debug("Remove request: {}", delete.toString()); - return getSession().execute(delete).wasApplied(); + return executeWrite(delete).wasApplied(); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java new file mode 100644 index 0000000000..2674c6ddea --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java @@ -0,0 +1,148 @@ +/** + * Copyright © 2016-2018 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.dao.nosql; + +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.Statement; +import com.google.common.base.Function; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.Uninterruptibles; +import org.thingsboard.server.dao.util.AsyncRateLimiter; + +import javax.annotation.Nullable; +import java.util.concurrent.*; + +public class RateLimitedResultSetFuture implements ResultSetFuture { + + private final ListenableFuture originalFuture; + private final ListenableFuture rateLimitFuture; + + public RateLimitedResultSetFuture(Session session, AsyncRateLimiter rateLimiter, Statement statement) { + this.rateLimitFuture = rateLimiter.acquireAsync(); + this.originalFuture = Futures.transform(rateLimitFuture, + (Function) i -> executeAsyncWithRelease(rateLimiter, session, statement)); + } + + @Override + public ResultSet getUninterruptibly() { + return safeGet().getUninterruptibly(); + } + + @Override + public ResultSet getUninterruptibly(long timeout, TimeUnit unit) throws TimeoutException { + long rateLimitStart = System.nanoTime(); + ResultSetFuture resultSetFuture = null; + try { + resultSetFuture = originalFuture.get(timeout, unit); + } catch (InterruptedException | ExecutionException e) { + throw new IllegalStateException(e); + } + long rateLimitDurationNano = System.nanoTime() - rateLimitStart; + long innerTimeoutNano = unit.toNanos(timeout) - rateLimitDurationNano; + if (innerTimeoutNano > 0) { + return resultSetFuture.getUninterruptibly(innerTimeoutNano, TimeUnit.NANOSECONDS); + } + throw new TimeoutException("Timeout waiting for task."); + } + + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + if (originalFuture.isDone()) { + return safeGet().cancel(mayInterruptIfRunning); + } else { + return originalFuture.cancel(mayInterruptIfRunning); + } + } + + @Override + public boolean isCancelled() { + if (originalFuture.isDone()) { + return safeGet().isCancelled(); + } + + return originalFuture.isCancelled(); + } + + @Override + public boolean isDone() { + return originalFuture.isDone() && safeGet().isDone(); + } + + @Override + public ResultSet get() throws InterruptedException, ExecutionException { + return safeGet().get(); + } + + @Override + public ResultSet get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + long rateLimitStart = System.nanoTime(); + ResultSetFuture resultSetFuture = originalFuture.get(timeout, unit); + long rateLimitDurationNano = System.nanoTime() - rateLimitStart; + long innerTimeoutNano = unit.toNanos(timeout) - rateLimitDurationNano; + if (innerTimeoutNano > 0) { + return resultSetFuture.get(innerTimeoutNano, TimeUnit.NANOSECONDS); + } + throw new TimeoutException("Timeout waiting for task."); + } + + @Override + public void addListener(Runnable listener, Executor executor) { + originalFuture.addListener(() -> { + try { + ResultSetFuture resultSetFuture = Uninterruptibles.getUninterruptibly(originalFuture); + resultSetFuture.addListener(listener, executor); + } catch (CancellationException e) { + cancel(false); + return; + } catch (ExecutionException e) { + Futures.immediateFailedFuture(e).addListener(listener, executor); + } + }, executor); + } + + private ResultSetFuture safeGet() { + try { + return originalFuture.get(); + } catch (InterruptedException | ExecutionException e) { + throw new IllegalStateException(e); + } + } + + private ResultSetFuture executeAsyncWithRelease(AsyncRateLimiter rateLimiter, Session session, Statement statement) { + try { + ResultSetFuture resultSetFuture = session.executeAsync(statement); + Futures.addCallback(resultSetFuture, new FutureCallback() { + @Override + public void onSuccess(@Nullable ResultSet result) { + rateLimiter.release(); + } + + @Override + public void onFailure(Throwable t) { + rateLimiter.release(); + } + }); + return resultSetFuture; + } catch (RuntimeException re) { + rateLimiter.release(); + throw re; + } + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index 9e252412b2..55838d6462 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java @@ -242,7 +242,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getSaveStmt() { if (saveStmt == null) { - saveStmt = getSession().prepare("INSERT INTO " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + " " + + saveStmt = prepare("INSERT INTO " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + " " + "(" + ModelConstants.RELATION_FROM_ID_PROPERTY + "," + ModelConstants.RELATION_FROM_TYPE_PROPERTY + "," + ModelConstants.RELATION_TO_ID_PROPERTY + @@ -257,7 +257,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getDeleteStmt() { if (deleteStmt == null) { - deleteStmt = getSession().prepare("DELETE FROM " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + + deleteStmt = prepare("DELETE FROM " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + WHERE + ModelConstants.RELATION_FROM_ID_PROPERTY + " = ?" + AND + ModelConstants.RELATION_FROM_TYPE_PROPERTY + " = ?" + AND + ModelConstants.RELATION_TO_ID_PROPERTY + " = ?" + @@ -270,7 +270,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getDeleteAllByEntityStmt() { if (deleteAllByEntityStmt == null) { - deleteAllByEntityStmt = getSession().prepare("DELETE FROM " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + + deleteAllByEntityStmt = prepare("DELETE FROM " + ModelConstants.RELATION_COLUMN_FAMILY_NAME + WHERE + ModelConstants.RELATION_FROM_ID_PROPERTY + " = ?" + AND + ModelConstants.RELATION_FROM_TYPE_PROPERTY + " = ?"); } @@ -279,7 +279,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getFindAllByFromStmt() { if (findAllByFromStmt == null) { - findAllByFromStmt = getSession().prepare(SELECT_COLUMNS + " " + + findAllByFromStmt = prepare(SELECT_COLUMNS + " " + FROM + ModelConstants.RELATION_COLUMN_FAMILY_NAME + " " + WHERE + ModelConstants.RELATION_FROM_ID_PROPERTY + EQUAL_TO_PARAM + AND + ModelConstants.RELATION_FROM_TYPE_PROPERTY + EQUAL_TO_PARAM + @@ -290,7 +290,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getFindAllByFromAndTypeStmt() { if (findAllByFromAndTypeStmt == null) { - findAllByFromAndTypeStmt = getSession().prepare(SELECT_COLUMNS + " " + + findAllByFromAndTypeStmt = prepare(SELECT_COLUMNS + " " + FROM + ModelConstants.RELATION_COLUMN_FAMILY_NAME + " " + WHERE + ModelConstants.RELATION_FROM_ID_PROPERTY + EQUAL_TO_PARAM + AND + ModelConstants.RELATION_FROM_TYPE_PROPERTY + EQUAL_TO_PARAM + @@ -303,7 +303,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getFindAllByToStmt() { if (findAllByToStmt == null) { - findAllByToStmt = getSession().prepare(SELECT_COLUMNS + " " + + findAllByToStmt = prepare(SELECT_COLUMNS + " " + FROM + ModelConstants.RELATION_REVERSE_VIEW_NAME + " " + WHERE + ModelConstants.RELATION_TO_ID_PROPERTY + EQUAL_TO_PARAM + AND + ModelConstants.RELATION_TO_TYPE_PROPERTY + EQUAL_TO_PARAM + @@ -314,7 +314,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getFindAllByToAndTypeStmt() { if (findAllByToAndTypeStmt == null) { - findAllByToAndTypeStmt = getSession().prepare(SELECT_COLUMNS + " " + + findAllByToAndTypeStmt = prepare(SELECT_COLUMNS + " " + FROM + ModelConstants.RELATION_REVERSE_VIEW_NAME + " " + WHERE + ModelConstants.RELATION_TO_ID_PROPERTY + EQUAL_TO_PARAM + AND + ModelConstants.RELATION_TO_TYPE_PROPERTY + EQUAL_TO_PARAM + @@ -327,7 +327,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati private PreparedStatement getCheckRelationStmt() { if (checkRelationStmt == null) { - checkRelationStmt = getSession().prepare(SELECT_COLUMNS + " " + + checkRelationStmt = prepare(SELECT_COLUMNS + " " + FROM + ModelConstants.RELATION_COLUMN_FAMILY_NAME + " " + WHERE + ModelConstants.RELATION_FROM_ID_PROPERTY + EQUAL_TO_PARAM + AND + ModelConstants.RELATION_FROM_TYPE_PROPERTY + EQUAL_TO_PARAM + diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index d620e11f1d..aba3eefbc9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -73,7 +73,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement partitionInsertStmt; private PreparedStatement partitionInsertTtlStmt; - private PreparedStatement[] latestInsertStmts; + private PreparedStatement latestInsertStmt; private PreparedStatement[] saveStmts; private PreparedStatement[] saveTtlStmts; private PreparedStatement[] fetchStmts; @@ -306,13 +306,15 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem @Override public ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { - DataType type = tsKvEntry.getDataType(); - BoundStatement stmt = getLatestStmt(type).bind() + BoundStatement stmt = getLatestStmt().bind() .setString(0, entityId.getEntityType().name()) .setUUID(1, entityId.getId()) .setString(2, tsKvEntry.getKey()) - .setLong(3, tsKvEntry.getTs()); - addValue(tsKvEntry, stmt, 4); + .setLong(3, tsKvEntry.getTs()) + .set(4, tsKvEntry.getBooleanValue().orElse(null), Boolean.class) + .set(5, tsKvEntry.getStrValue().orElse(null), String.class) + .set(6, tsKvEntry.getLongValue().orElse(null), Long.class) + .set(7, tsKvEntry.getDoubleValue().orElse(null), Double.class); return getFuture(executeAsyncWrite(stmt), rs -> null); } @@ -381,7 +383,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem if (saveStmts == null) { saveStmts = new PreparedStatement[DataType.values().length]; for (DataType type : DataType.values()) { - saveStmts[type.ordinal()] = getSession().prepare(INSERT_INTO + ModelConstants.TS_KV_CF + + saveStmts[type.ordinal()] = prepare(INSERT_INTO + ModelConstants.TS_KV_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + "," + ModelConstants.KEY_COLUMN + @@ -398,7 +400,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem if (saveTtlStmts == null) { saveTtlStmts = new PreparedStatement[DataType.values().length]; for (DataType type : DataType.values()) { - saveTtlStmts[type.ordinal()] = getSession().prepare(INSERT_INTO + ModelConstants.TS_KV_CF + + saveTtlStmts[type.ordinal()] = prepare(INSERT_INTO + ModelConstants.TS_KV_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + "," + ModelConstants.KEY_COLUMN + @@ -420,7 +422,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } else if (type == Aggregation.AVG && fetchStmts[Aggregation.SUM.ordinal()] != null) { fetchStmts[type.ordinal()] = fetchStmts[Aggregation.SUM.ordinal()]; } else { - fetchStmts[type.ordinal()] = getSession().prepare(SELECT_PREFIX + + fetchStmts[type.ordinal()] = prepare(SELECT_PREFIX + String.join(", ", ModelConstants.getFetchColumnNames(type)) + " FROM " + ModelConstants.TS_KV_CF + " WHERE " + ModelConstants.ENTITY_TYPE_COLUMN + EQUALS_PARAM + "AND " + ModelConstants.ENTITY_ID_COLUMN + EQUALS_PARAM @@ -435,26 +437,29 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem return fetchStmts[aggType.ordinal()]; } - private PreparedStatement getLatestStmt(DataType dataType) { - if (latestInsertStmts == null) { - latestInsertStmts = new PreparedStatement[DataType.values().length]; - for (DataType type : DataType.values()) { - latestInsertStmts[type.ordinal()] = getSession().prepare(INSERT_INTO + ModelConstants.TS_KV_LATEST_CF + - "(" + ModelConstants.ENTITY_TYPE_COLUMN + - "," + ModelConstants.ENTITY_ID_COLUMN + - "," + ModelConstants.KEY_COLUMN + - "," + ModelConstants.TS_COLUMN + - "," + getColumnName(type) + ")" + - " VALUES(?, ?, ?, ?, ?)"); - } + private PreparedStatement getLatestStmt() { + if (latestInsertStmt == null) { +// latestInsertStmt = new PreparedStatement[DataType.values().length]; +// for (DataType type : DataType.values()) { + latestInsertStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_LATEST_CF + + "(" + ModelConstants.ENTITY_TYPE_COLUMN + + "," + ModelConstants.ENTITY_ID_COLUMN + + "," + ModelConstants.KEY_COLUMN + + "," + ModelConstants.TS_COLUMN + + "," + ModelConstants.BOOLEAN_VALUE_COLUMN + + "," + ModelConstants.STRING_VALUE_COLUMN + + "," + ModelConstants.LONG_VALUE_COLUMN + + "," + ModelConstants.DOUBLE_VALUE_COLUMN + ")" + + " VALUES(?, ?, ?, ?, ?)"); +// } } - return latestInsertStmts[dataType.ordinal()]; + return latestInsertStmt; } private PreparedStatement getPartitionInsertStmt() { if (partitionInsertStmt == null) { - partitionInsertStmt = getSession().prepare(INSERT_INTO + ModelConstants.TS_KV_PARTITIONS_CF + + partitionInsertStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_PARTITIONS_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + "," + ModelConstants.PARTITION_COLUMN + @@ -466,7 +471,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement getPartitionInsertTtlStmt() { if (partitionInsertTtlStmt == null) { - partitionInsertTtlStmt = getSession().prepare(INSERT_INTO + ModelConstants.TS_KV_PARTITIONS_CF + + partitionInsertTtlStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_PARTITIONS_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + "," + ModelConstants.PARTITION_COLUMN + @@ -479,7 +484,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement getFindLatestStmt() { if (findLatestStmt == null) { - findLatestStmt = getSession().prepare(SELECT_PREFIX + + findLatestStmt = prepare(SELECT_PREFIX + ModelConstants.KEY_COLUMN + "," + ModelConstants.TS_COLUMN + "," + ModelConstants.STRING_VALUE_COLUMN + "," + @@ -496,7 +501,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement getFindAllLatestStmt() { if (findAllLatestStmt == null) { - findAllLatestStmt = getSession().prepare(SELECT_PREFIX + + findAllLatestStmt = prepare(SELECT_PREFIX + ModelConstants.KEY_COLUMN + "," + ModelConstants.TS_COLUMN + "," + ModelConstants.STRING_VALUE_COLUMN + "," + diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/AsyncRateLimiter.java b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncRateLimiter.java new file mode 100644 index 0000000000..6fb21d6adb --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncRateLimiter.java @@ -0,0 +1,25 @@ +/** + * Copyright © 2016-2018 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.dao.util; + +import com.google.common.util.concurrent.ListenableFuture; + +public interface AsyncRateLimiter { + + ListenableFuture acquireAsync(); + + void release(); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java new file mode 100644 index 0000000000..de07dbfa47 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java @@ -0,0 +1,160 @@ +/** + * Copyright © 2016-2018 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.dao.util; + +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +@Component +@Slf4j +public class BufferedRateLimiter implements AsyncRateLimiter { + + private final ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + + private final int permitsLimit; + private final int maxPermitWaitTime; + private final AtomicInteger permits; + private final BlockingQueue queue; + + private final AtomicInteger maxQueueSize = new AtomicInteger(); + private final AtomicInteger maxGrantedPermissions = new AtomicInteger(); + + public BufferedRateLimiter(@Value("${cassandra.query.buffer_size}") int queueLimit, + @Value("${cassandra.query.concurrent_limit}") int permitsLimit, + @Value("${cassandra.query.permit_max_wait_time}") int maxPermitWaitTime) { + this.permitsLimit = permitsLimit; + this.maxPermitWaitTime = maxPermitWaitTime; + this.permits = new AtomicInteger(); + this.queue = new LinkedBlockingQueue<>(queueLimit); + } + + @Override + public ListenableFuture acquireAsync() { + if (queue.isEmpty()) { + if (permits.incrementAndGet() <= permitsLimit) { + if (permits.get() > maxGrantedPermissions.get()) { + maxGrantedPermissions.set(permits.get()); + } + return Futures.immediateFuture(null); + } + permits.decrementAndGet(); + } + + return putInQueue(); + } + + @Override + public void release() { + permits.decrementAndGet(); + reprocessQueue(); + } + + private void reprocessQueue() { + while (permits.get() < permitsLimit) { + if (permits.incrementAndGet() <= permitsLimit) { + if (permits.get() > maxGrantedPermissions.get()) { + maxGrantedPermissions.set(permits.get()); + } + LockedFuture lockedFuture = queue.poll(); + if (lockedFuture != null) { + lockedFuture.latch.countDown(); + } else { + permits.decrementAndGet(); + break; + } + } else { + permits.decrementAndGet(); + } + } + } + + private LockedFuture createLockedFuture() { + CountDownLatch latch = new CountDownLatch(1); + ListenableFuture future = pool.submit(() -> { + latch.await(); + return null; + }); + return new LockedFuture(latch, future, System.currentTimeMillis()); + } + + private ListenableFuture putInQueue() { + + int size = queue.size(); + if (size > maxQueueSize.get()) { + maxQueueSize.set(size); + } + + if (queue.remainingCapacity() > 0) { + try { + LockedFuture lockedFuture = createLockedFuture(); + if (!queue.offer(lockedFuture, 1, TimeUnit.SECONDS)) { + lockedFuture.cancelFuture(); + return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); + } + return lockedFuture.future; + } catch (InterruptedException e) { + return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Task interrupted. Reject")); + } + } + return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); + } + + @Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}") + public void printStats() { + int expiredCount = 0; + for (LockedFuture lockedFuture : queue) { + if (lockedFuture.isExpired()) { + lockedFuture.cancelFuture(); + expiredCount++; + } + } + log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}]", maxQueueSize.getAndSet(0), + maxGrantedPermissions.getAndSet(0), expiredCount); + } + + private class LockedFuture { + final CountDownLatch latch; + final ListenableFuture future; + final long createTime; + + public LockedFuture(CountDownLatch latch, ListenableFuture future, long createTime) { + this.latch = latch; + this.future = future; + this.createTime = createTime; + } + + void cancelFuture() { + future.cancel(false); + latch.countDown(); + } + + boolean isExpired() { + return (System.currentTimeMillis() - createTime) > maxPermitWaitTime; + } + + } + + +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java b/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java new file mode 100644 index 0000000000..fa62c2b9b0 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java @@ -0,0 +1,156 @@ +/** + * Copyright © 2016-2018 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.dao.nosql; + +import com.datastax.driver.core.*; +import com.datastax.driver.core.exceptions.UnsupportedFeatureException; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; +import org.thingsboard.server.dao.util.AsyncRateLimiter; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +@RunWith(MockitoJUnitRunner.class) +public class RateLimitedResultSetFutureTest { + + private RateLimitedResultSetFuture resultSetFuture; + + @Mock + private AsyncRateLimiter rateLimiter; + @Mock + private Session session; + @Mock + private Statement statement; + @Mock + private ResultSetFuture realFuture; + @Mock + private ResultSet rows; + @Mock + private Row row; + + @Test + public void doNotReleasePermissionIfRateLimitFutureFailed() throws InterruptedException { + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFailedFuture(new IllegalArgumentException())); + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + Thread.sleep(1000L); + verify(rateLimiter).acquireAsync(); + try { + assertTrue(resultSetFuture.isDone()); + fail(); + } catch (Exception e) { + assertTrue(e instanceof IllegalStateException); + Throwable actualCause = e.getCause(); + assertTrue(actualCause instanceof ExecutionException); + } + verifyNoMoreInteractions(session, rateLimiter, statement); + + } + + @Test + public void getUninterruptiblyDelegateToCassandra() throws InterruptedException, ExecutionException { + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFuture(null)); + when(session.executeAsync(statement)).thenReturn(realFuture); + Mockito.doAnswer((Answer) invocation -> { + Object[] args = invocation.getArguments(); + Runnable task = (Runnable) args[0]; + task.run(); + return null; + }).when(realFuture).addListener(Mockito.any(), Mockito.any()); + + when(realFuture.getUninterruptibly()).thenReturn(rows); + + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + ResultSet actual = resultSetFuture.getUninterruptibly(); + assertSame(rows, actual); + verify(rateLimiter, times(1)).acquireAsync(); + verify(rateLimiter, times(1)).release(); + } + + @Test + public void addListenerAllowsFutureTransformation() throws InterruptedException, ExecutionException { + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFuture(null)); + when(session.executeAsync(statement)).thenReturn(realFuture); + Mockito.doAnswer((Answer) invocation -> { + Object[] args = invocation.getArguments(); + Runnable task = (Runnable) args[0]; + task.run(); + return null; + }).when(realFuture).addListener(Mockito.any(), Mockito.any()); + + when(realFuture.get()).thenReturn(rows); + when(rows.one()).thenReturn(row); + + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + + ListenableFuture transform = Futures.transform(resultSetFuture, ResultSet::one); + Row actualRow = transform.get(); + + assertSame(row, actualRow); + verify(rateLimiter, times(1)).acquireAsync(); + verify(rateLimiter, times(1)).release(); + } + + @Test + public void immidiateCassandraExceptionReturnsPermit() throws InterruptedException, ExecutionException { + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFuture(null)); + when(session.executeAsync(statement)).thenThrow(new UnsupportedFeatureException(ProtocolVersion.V3, "hjg")); + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + ListenableFuture transform = Futures.transform(resultSetFuture, ResultSet::one); + try { + transform.get(); + fail(); + } catch (Exception e) { + assertTrue(e instanceof ExecutionException); + } + verify(rateLimiter, times(1)).acquireAsync(); + verify(rateLimiter, times(1)).release(); + } + + @Test + public void queryTimeoutReturnsPermit() throws InterruptedException, ExecutionException { + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFuture(null)); + when(session.executeAsync(statement)).thenReturn(realFuture); + Mockito.doAnswer((Answer) invocation -> { + Object[] args = invocation.getArguments(); + Runnable task = (Runnable) args[0]; + task.run(); + return null; + }).when(realFuture).addListener(Mockito.any(), Mockito.any()); + + when(realFuture.get()).thenThrow(new ExecutionException("Fail", new TimeoutException("timeout"))); + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + ListenableFuture transform = Futures.transform(resultSetFuture, ResultSet::one); + try { + transform.get(); + fail(); + } catch (Exception e) { + assertTrue(e instanceof ExecutionException); + } + verify(rateLimiter, times(1)).acquireAsync(); + verify(rateLimiter, times(1)).release(); + } + +} \ No newline at end of file diff --git a/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java b/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java new file mode 100644 index 0000000000..5bfc3b6e95 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java @@ -0,0 +1,134 @@ +/** + * Copyright © 2016-2018 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.dao.util; + +import com.google.common.util.concurrent.*; +import org.junit.Test; + +import javax.annotation.Nullable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.Assert.*; + + +public class BufferedRateLimiterTest { + + @Test + public void finishedFutureReturnedIfPermitsAreGranted() { + BufferedRateLimiter limiter = new BufferedRateLimiter(10, 10, 100); + ListenableFuture actual = limiter.acquireAsync(); + assertTrue(actual.isDone()); + } + + @Test + public void notFinishedFutureReturnedIfPermitsAreNotGranted() { + BufferedRateLimiter limiter = new BufferedRateLimiter(10, 1, 100); + ListenableFuture actual1 = limiter.acquireAsync(); + ListenableFuture actual2 = limiter.acquireAsync(); + assertTrue(actual1.isDone()); + assertFalse(actual2.isDone()); + } + + @Test + public void failedFutureReturnedIfQueueIsfull() { + BufferedRateLimiter limiter = new BufferedRateLimiter(1, 1, 100); + ListenableFuture actual1 = limiter.acquireAsync(); + ListenableFuture actual2 = limiter.acquireAsync(); + ListenableFuture actual3 = limiter.acquireAsync(); + + assertTrue(actual1.isDone()); + assertFalse(actual2.isDone()); + assertTrue(actual3.isDone()); + try { + actual3.get(); + fail(); + } catch (Exception e) { + assertTrue(e instanceof ExecutionException); + Throwable actualCause = e.getCause(); + assertTrue(actualCause instanceof IllegalStateException); + assertEquals("Rate Limit Buffer is full. Reject", actualCause.getMessage()); + } + } + + @Test + public void releasedPermitTriggerTasksFromQueue() throws InterruptedException { + BufferedRateLimiter limiter = new BufferedRateLimiter(10, 2, 100); + ListenableFuture actual1 = limiter.acquireAsync(); + ListenableFuture actual2 = limiter.acquireAsync(); + ListenableFuture actual3 = limiter.acquireAsync(); + ListenableFuture actual4 = limiter.acquireAsync(); + assertTrue(actual1.isDone()); + assertTrue(actual2.isDone()); + assertFalse(actual3.isDone()); + assertFalse(actual4.isDone()); + limiter.release(); + TimeUnit.MILLISECONDS.sleep(100L); + assertTrue(actual3.isDone()); + assertFalse(actual4.isDone()); + limiter.release(); + TimeUnit.MILLISECONDS.sleep(100L); + assertTrue(actual4.isDone()); + } + + @Test + public void permitsReleasedInConcurrentMode() throws InterruptedException { + BufferedRateLimiter limiter = new BufferedRateLimiter(10, 2, 100); + AtomicInteger actualReleased = new AtomicInteger(); + AtomicInteger actualRejected = new AtomicInteger(); + ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(5)); + for (int i = 0; i < 100; i++) { + ListenableFuture> submit = pool.submit(limiter::acquireAsync); + Futures.addCallback(submit, new FutureCallback>() { + @Override + public void onSuccess(@Nullable ListenableFuture result) { + Futures.addCallback(result, new FutureCallback() { + @Override + public void onSuccess(@Nullable Void result) { + try { + TimeUnit.MILLISECONDS.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + limiter.release(); + actualReleased.incrementAndGet(); + } + + @Override + public void onFailure(Throwable t) { + actualRejected.incrementAndGet(); + } + }); + } + + @Override + public void onFailure(Throwable t) { + } + }); + } + + TimeUnit.SECONDS.sleep(2); + assertTrue("Unexpected released count " + actualReleased.get(), + actualReleased.get() > 10 && actualReleased.get() < 20); + assertTrue("Unexpected rejected count " + actualRejected.get(), + actualRejected.get() > 80 && actualRejected.get() < 90); + + } + + +} \ No newline at end of file From f49d480d30ac5b5ac187b6a7676f19c129616d9c Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 23 Mar 2018 13:35:04 +0200 Subject: [PATCH 29/75] No More Plugins --- .../controller/TelemetryController.java | 350 ++++++++++++++++++ .../server/controller/ValidationCallback.java | 73 ++++ .../service/security/model/SecurityUser.java | 1 + .../thingsboard/server/common/data/User.java | 12 + .../api/plugins/PluginConstants.java | 2 + 5 files changed, 438 insertions(+) create mode 100644 application/src/main/java/org/thingsboard/server/controller/TelemetryController.java create mode 100644 application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java new file mode 100644 index 0000000000..dcc4a5cf54 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -0,0 +1,350 @@ +package org.thingsboard.server.controller; + +import com.google.common.base.Function; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.common.data.DataConstants; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; +import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; +import org.thingsboard.server.extensions.api.plugins.PluginConstants; +import org.thingsboard.server.service.security.model.SecurityUser; + +import javax.annotation.Nullable; +import javax.annotation.PreDestroy; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.stream.Collectors; + +/** + * Created by ashvayka on 22.03.18. + */ +@RestController +@RequestMapping(PluginConstants.TELEMETRY_URL_PREFIX) +@Slf4j +public class TelemetryController extends BaseController { + + public static final String CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "Customer user is not allowed to perform this operation!"; + public static final String SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "System administrator is not allowed to perform this operation!"; + public static final String DEVICE_WITH_REQUESTED_ID_NOT_FOUND = "Device with requested id wasn't found!"; + + @Autowired + private AttributesService attributesService; + + @Autowired + private TimeseriesService tsService; + + private ExecutorService executor; + + public void initExecutor() { + executor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (executor != null) { + executor.shutdownNow(); + } + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributeKeys( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { + DeferredResult response = new DeferredResult(); + EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + + validate(getCurrentUser(), entityId, new ValidationCallback(response, + new FutureCallback>() { + @Override + public void onSuccess(@Nullable DeferredResult result) { + List>> futures = new ArrayList<>(); + for (String scope : DataConstants.allScopes()) { + futures.add(attributesService.findAll(entityId, scope)); + } + + ListenableFuture> future = Futures.transform(Futures.successfulAsList(futures), + (Function>, ? extends List>) input -> { + List tmp = new ArrayList<>(); + if (input != null) { + input.forEach(tmp::addAll); + } + return tmp; + }, executor); + + Futures.addCallback(future, getAttributeKeysPluginCallback(result)); + } + + @Override + public void onFailure(Throwable t) { + handleError(t, response, HttpStatus.INTERNAL_SERVER_ERROR); + } + })); + + return response; + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES/{scope}", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributeKeysByScope() { + return null; + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributeValues() { + return null; + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributeValuesByScope() { + return null; + } + + private FutureCallback> getAttributeKeysPluginCallback(final DeferredResult response) { + return new FutureCallback>() { + + @Override + public void onSuccess(List attributes) { + List keys = attributes.stream().map(KvEntry::getKey).collect(Collectors.toList()); + response.setResult(new ResponseEntity<>(keys, HttpStatus.OK)); + } + + @Override + public void onFailure(Throwable e) { + log.error("Failed to fetch attributes", e); + handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + } + }; + } + + private void handleError(Throwable e, final DeferredResult response, HttpStatus defaultErrorStatus) { + ResponseEntity responseEntity; + if (e != null && e instanceof ToErrorResponseEntity) { + responseEntity = ((ToErrorResponseEntity) e).toErrorResponseEntity(); + } else if (e != null && e instanceof IllegalArgumentException) { + responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + } else { + responseEntity = new ResponseEntity<>(defaultErrorStatus); + } + response.setResult(responseEntity); + } + + private void validate(SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + switch (entityId.getEntityType()) { + case DEVICE: + validateDevice(currentUser, entityId, callback); + return; +// case ASSET: +// validateAsset(ctx, entityId, callback); +// return; +// case RULE: +// validateRule(ctx, entityId, callback); +// return; +// case RULE_CHAIN: +// validateRuleChain(ctx, entityId, callback); +// return; +// case PLUGIN: +// validatePlugin(ctx, entityId, callback); +// return; +// case CUSTOMER: +// validateCustomer(ctx, entityId, callback); +// return; +// case TENANT: +// validateTenant(ctx, entityId, callback); +// return; + default: + //TODO: add support of other entities + throw new IllegalStateException("Not Implemented!"); + } + } + + private void validateDevice(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture deviceFuture = deviceService.findDeviceByIdAsync(new DeviceId(entityId.getId())); + Futures.addCallback(deviceFuture, getCallback(callback, device -> { + if (device == null) { + return ValidationResult.entityNotFound(DEVICE_WITH_REQUESTED_ID_NOT_FOUND); + } else { + if (!device.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Device doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !device.getCustomerId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Device doesn't belong to the current Customer!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private FutureCallback getCallback(ValidationCallback callback, Function transformer) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable T result) { + callback.onSuccess(transformer.apply(result)); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } +// +// private void validateAsset(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isSystemAdmin()) { +// callback.onSuccess(this, ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else { +// ListenableFuture assetFuture = pluginCtx.assetService.findAssetByIdAsync(new AssetId(entityId.getId())); +// Futures.addCallback(assetFuture, getCallback(callback, asset -> { +// if (asset == null) { +// return ValidationResult.entityNotFound("Asset with requested id wasn't found!"); +// } else { +// if (!asset.getTenantId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Asset doesn't belong to the current Tenant!"); +// } else if (ctx.isCustomerUser() && !asset.getCustomerId().equals(ctx.getCustomerId())) { +// return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); +// } else { +// return ValidationResult.ok(); +// } +// } +// })); +// } +// } +// +// private void validateRule(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isCustomerUser()) { +// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else { +// ListenableFuture ruleFuture = pluginCtx.ruleService.findRuleByIdAsync(new RuleId(entityId.getId())); +// Futures.addCallback(ruleFuture, getCallback(callback, rule -> { +// if (rule == null) { +// return ValidationResult.entityNotFound("Rule with requested id wasn't found!"); +// } else { +// if (ctx.isTenantAdmin() && !rule.getTenantId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Rule doesn't belong to the current Tenant!"); +// } else if (ctx.isSystemAdmin() && !rule.getTenantId().isNullUid()) { +// return ValidationResult.accessDenied("Rule is not in system scope!"); +// } else { +// return ValidationResult.ok(); +// } +// } +// })); +// } +// } +// +// private void validateRuleChain(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isCustomerUser()) { +// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else { +// ListenableFuture ruleChainFuture = pluginCtx.ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); +// Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { +// if (ruleChain == null) { +// return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); +// } else { +// if (ctx.isTenantAdmin() && !ruleChain.getTenantId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); +// } else if (ctx.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { +// return ValidationResult.accessDenied("Rule chain is not in system scope!"); +// } else { +// return ValidationResult.ok(); +// } +// } +// })); +// } +// } +// +// +// private void validatePlugin(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isCustomerUser()) { +// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else { +// ListenableFuture pluginFuture = pluginCtx.pluginService.findPluginByIdAsync(new PluginId(entityId.getId())); +// Futures.addCallback(pluginFuture, getCallback(callback, plugin -> { +// if (plugin == null) { +// return ValidationResult.entityNotFound("Plugin with requested id wasn't found!"); +// } else { +// if (ctx.isTenantAdmin() && !plugin.getTenantId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Plugin doesn't belong to the current Tenant!"); +// } else if (ctx.isSystemAdmin() && !plugin.getTenantId().isNullUid()) { +// return ValidationResult.accessDenied("Plugin is not in system scope!"); +// } else { +// return ValidationResult.ok(); +// } +// } +// })); +// } +// } +// +// private void validateCustomer(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isSystemAdmin()) { +// callback.onSuccess(this, ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else { +// ListenableFuture customerFuture = pluginCtx.customerService.findCustomerByIdAsync(new CustomerId(entityId.getId())); +// Futures.addCallback(customerFuture, getCallback(callback, customer -> { +// if (customer == null) { +// return ValidationResult.entityNotFound("Customer with requested id wasn't found!"); +// } else { +// if (!customer.getTenantId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Customer doesn't belong to the current Tenant!"); +// } else if (ctx.isCustomerUser() && !customer.getId().equals(ctx.getCustomerId())) { +// return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); +// } else { +// return ValidationResult.ok(); +// } +// } +// })); +// } +// } +// +// private void validateTenant(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { +// if (ctx.isCustomerUser()) { +// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); +// } else if (ctx.isSystemAdmin()) { +// callback.onSuccess(this, ValidationResult.ok()); +// } else { +// ListenableFuture tenantFuture = pluginCtx.tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); +// Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { +// if (tenant == null) { +// return ValidationResult.entityNotFound("Tenant with requested id wasn't found!"); +// } else if (!tenant.getId().equals(ctx.getTenantId())) { +// return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); +// } else { +// return ValidationResult.ok(); +// } +// })); +// } +// } + + +} diff --git a/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java b/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java new file mode 100644 index 0000000000..ead90ea2f2 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java @@ -0,0 +1,73 @@ +/** + * Copyright © 2016-2018 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.controller; + +import com.google.common.util.concurrent.FutureCallback; +import org.springframework.http.ResponseEntity; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.actors.plugin.ValidationResultCode; +import org.thingsboard.server.extensions.api.exception.AccessDeniedException; +import org.thingsboard.server.extensions.api.exception.EntityNotFoundException; +import org.thingsboard.server.extensions.api.exception.InternalErrorException; +import org.thingsboard.server.extensions.api.exception.UnauthorizedException; + +/** + * Created by ashvayka on 21.02.17. + */ +public class ValidationCallback implements FutureCallback { + + private final DeferredResult response; + private final FutureCallback> action; + + public ValidationCallback(DeferredResult response, FutureCallback> action) { + this.response = response; + this.action = action; + } + + @Override + public void onSuccess(ValidationResult result) { + ValidationResultCode resultCode = result.getResultCode(); + if (resultCode == ValidationResultCode.OK) { + action.onSuccess(response); + } else { + Exception e; + switch (resultCode) { + case ENTITY_NOT_FOUND: + e = new EntityNotFoundException(result.getMessage()); + break; + case UNAUTHORIZED: + e = new UnauthorizedException(result.getMessage()); + break; + case ACCESS_DENIED: + e = new AccessDeniedException(result.getMessage()); + break; + case INTERNAL_ERROR: + e = new InternalErrorException(result.getMessage()); + break; + default: + e = new UnauthorizedException("Permission denied."); + break; + } + onFailure(e); + } + } + + @Override + public void onFailure(Throwable e) { + action.onFailure(e); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java index f4a28a03a6..91ee7bf6d3 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java +++ b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java @@ -18,6 +18,7 @@ package org.thingsboard.server.service.security.model; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.UserId; import java.util.Collection; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java index 3b957764fc..7b016f540e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java @@ -18,6 +18,7 @@ package org.thingsboard.server.common.data; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; 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.common.data.security.Authority; @@ -138,4 +139,15 @@ public class User extends SearchTextBasedWithAdditionalInfo implements H return builder.toString(); } + public boolean isSystemAdmin() { + return tenantId == null || EntityId.NULL_UUID.equals(tenantId.getId()); + } + + public boolean isTenantAdmin() { + return !isSystemAdmin() && (customerId == null || EntityId.NULL_UUID.equals(customerId.getId())); + } + + public boolean isCustomerUser() { + return !isSystemAdmin() && !isTenantAdmin(); + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginConstants.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginConstants.java index ac9600a6a5..d7438f4fbc 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginConstants.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginConstants.java @@ -19,5 +19,7 @@ package org.thingsboard.server.extensions.api.plugins; * @author Andrew Shvayka */ public class PluginConstants { + public static final String TELEMETRY_URL_PREFIX = "/api/plugins/telemetry"; + public static final String RPC_URL_PREFIX = "/api/plugins/rpc"; public static final String PLUGIN_URL_PREFIX = "/api/plugins"; } From c1884df254ba58552111dc2787f3ce2fac7bf8bb Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 23 Mar 2018 14:20:22 +0200 Subject: [PATCH 30/75] Fix for latest telemetry --- .../server/dao/timeseries/CassandraBaseTimeseriesDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index aba3eefbc9..cf141711a5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -450,7 +450,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem "," + ModelConstants.STRING_VALUE_COLUMN + "," + ModelConstants.LONG_VALUE_COLUMN + "," + ModelConstants.DOUBLE_VALUE_COLUMN + ")" + - " VALUES(?, ?, ?, ?, ?)"); + " VALUES(?, ?, ?, ?, ?, ?, ?, ?)"); // } } return latestInsertStmt; From 68a943e2677053358bea9566e4e42a26d4eed217 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 23 Mar 2018 16:40:27 +0200 Subject: [PATCH 31/75] Fix ace editors. --- ui/src/app/components/ace-editor-fix.js | 45 +++++++++++++++++++ ui/src/app/components/js-func.directive.js | 3 ++ .../components/json-object-edit.directive.js | 5 ++- .../components/react/json-form-ace-editor.jsx | 8 ++++ .../widget/widget-config.directive.js | 5 +++ 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 ui/src/app/components/ace-editor-fix.js diff --git a/ui/src/app/components/ace-editor-fix.js b/ui/src/app/components/ace-editor-fix.js new file mode 100644 index 0000000000..f68767e6e3 --- /dev/null +++ b/ui/src/app/components/ace-editor-fix.js @@ -0,0 +1,45 @@ +/* + * Copyright © 2016-2018 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. + */ + +export default function fixAceEditor(aceEditor) { + aceEditor.$blockScrolling = Infinity; + aceEditor.on("showGutterTooltip", function (tooltip) { + if (!tooltip.isAttachedToBody) { + document.body.appendChild(tooltip.$element); //eslint-disable-line + tooltip.isAttachedToBody = true; + onElementRemoved(tooltip.$parentNode, () => { + if (tooltip.$element.parentNode != null) { + tooltip.$element.parentNode.removeChild(tooltip.$element); + } + }); + } + }); +} + +function onElementRemoved(element, callback) { + if (!document.body.contains(element)) { //eslint-disable-line + callback(); + } else { + var observer; + observer = new MutationObserver(function(mutations) { //eslint-disable-line + if (!document.body.contains(element)) { //eslint-disable-line + callback(); + observer.disconnect(); + } + }); + observer.observe(document.body, {childList: true}); //eslint-disable-line + } +} diff --git a/ui/src/app/components/js-func.directive.js b/ui/src/app/components/js-func.directive.js index f95d003e8a..33cebdebf0 100644 --- a/ui/src/app/components/js-func.directive.js +++ b/ui/src/app/components/js-func.directive.js @@ -22,6 +22,8 @@ import thingsboardToast from '../services/toast'; import thingsboardUtils from '../common/utils.service'; import thingsboardExpandFullscreen from './expand-fullscreen.directive'; +import fixAceEditor from './ace-editor-fix'; + /* eslint-disable import/no-unresolved, import/default */ import jsFuncTemplate from './js-func.tpl.html'; @@ -83,6 +85,7 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) { scope.js_editor.session.on("change", function () { scope.cleanupJsErrors(); }); + fixAceEditor(_ace); } }; diff --git a/ui/src/app/components/json-object-edit.directive.js b/ui/src/app/components/json-object-edit.directive.js index 03ddc07db7..db0aa60bb5 100644 --- a/ui/src/app/components/json-object-edit.directive.js +++ b/ui/src/app/components/json-object-edit.directive.js @@ -19,6 +19,8 @@ import 'brace/ext/language_tools'; import 'brace/mode/json'; import 'ace-builds/src-min-noconflict/snippets/json'; +import fixAceEditor from './ace-editor-fix'; + /* eslint-disable import/no-unresolved, import/default */ import jsonObjectEditTemplate from './json-object-edit.tpl.html'; @@ -30,7 +32,7 @@ export default angular.module('thingsboard.directives.jsonObjectEdit', []) .name; /*@ngInject*/ -function JsonObjectEdit($compile, $templateCache, toast, utils) { +function JsonObjectEdit($compile, $templateCache, $document, toast, utils) { var linker = function (scope, element, attrs, ngModelCtrl) { var template = $templateCache.get(jsonObjectEditTemplate); @@ -67,6 +69,7 @@ function JsonObjectEdit($compile, $templateCache, toast, utils) { scope.json_editor.session.on("change", function () { scope.cleanupJsonErrors(); }); + fixAceEditor(_ace); } }; diff --git a/ui/src/app/components/react/json-form-ace-editor.jsx b/ui/src/app/components/react/json-form-ace-editor.jsx index 1c4c02e16f..5afd3d18f1 100644 --- a/ui/src/app/components/react/json-form-ace-editor.jsx +++ b/ui/src/app/components/react/json-form-ace-editor.jsx @@ -23,6 +23,8 @@ import FlatButton from 'material-ui/FlatButton'; import 'brace/ext/language_tools'; import 'brace/theme/github'; +import fixAceEditor from './../ace-editor-fix'; + class ThingsboardAceEditor extends React.Component { constructor(props) { @@ -31,6 +33,7 @@ class ThingsboardAceEditor extends React.Component { this.onBlur = this.onBlur.bind(this); this.onFocus = this.onFocus.bind(this); this.onTidy = this.onTidy.bind(this); + this.onLoad = this.onLoad.bind(this); var value = props.value ? props.value + '' : ''; this.state = { value: value, @@ -72,6 +75,10 @@ class ThingsboardAceEditor extends React.Component { } } + onLoad(editor) { + fixAceEditor(editor); + } + render() { const styles = reactCSS({ @@ -117,6 +124,7 @@ class ThingsboardAceEditor extends React.Component { onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur} + onLoad={this.onLoad} name={this.props.form.title} value={this.state.value} readOnly={this.props.form.readonly} diff --git a/ui/src/app/components/widget/widget-config.directive.js b/ui/src/app/components/widget/widget-config.directive.js index d0ee6a3d04..4d4d958427 100644 --- a/ui/src/app/components/widget/widget-config.directive.js +++ b/ui/src/app/components/widget/widget-config.directive.js @@ -23,6 +23,8 @@ import thingsboardJsonForm from '../json-form.directive'; import thingsboardManageWidgetActions from './action/manage-widget-actions.directive'; import 'angular-ui-ace'; +import fixAceEditor from './../ace-editor-fix'; + import './widget-config.scss'; /* eslint-disable import/no-unresolved, import/default */ @@ -72,6 +74,9 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout enableSnippets: true, enableBasicAutocompletion: true, enableLiveAutocompletion: true + }, + onLoad: function (_ace) { + fixAceEditor(_ace); } }; From 8b637c9e9456963e1e24ec0e6306903d2e765c1f Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Fri, 23 Mar 2018 16:54:48 +0200 Subject: [PATCH 32/75] add cassandra properties in test suite --- .../server/actors/plugin/PluginActorMessageProcessor.java | 1 + application/src/main/resources/thingsboard.yml | 4 ++-- .../quota/inmemory/HostRequestIntervalRegistry.java | 5 +++-- .../server/dao/timeseries/CassandraBaseTimeseriesDao.java | 3 --- .../thingsboard/server/dao/util/BufferedRateLimiter.java | 8 ++++++-- dao/src/test/resources/cassandra-test.properties | 5 +++++ 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java index 7dfe9a5d81..2af30d4b49 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java @@ -106,6 +106,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor try { pluginImpl.process(trustedCtx, msg.getRuleTenantId(), msg.getRuleId(), msg.getMsg()); } catch (Exception ex) { + logger.debug("[{}] Failed to process RuleToPlugin msg: [{}] [{}]", tenantId, msg.getMsg(), ex); RuleToPluginMsg ruleMsg = msg.getMsg(); MsgType responceMsgType = MsgType.RULE_ENGINE_ERROR; Integer requestId = 0; diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 07face1059..c47fc28fbd 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -133,7 +133,7 @@ quota: intervalMin: 2 database: - type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql + type: "${DATABASE_TYPE:sql}" # cassandra OR sql # Cassandra driver configuration parameters cassandra: @@ -226,7 +226,7 @@ caffeine: specs: relations: timeToLiveInMinutes: 1440 - maxSize: 0 + maxSize: 100000 deviceCredentials: timeToLiveInMinutes: 1440 maxSize: 100000 diff --git a/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java b/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java index 8d254a08c6..3782ed22ed 100644 --- a/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java +++ b/common/transport/src/main/java/org/thingsboard/server/common/transport/quota/inmemory/HostRequestIntervalRegistry.java @@ -61,13 +61,14 @@ public class HostRequestIntervalRegistry { } public long tick(String clientHostId) { + IntervalCount intervalCount = hostCounts.computeIfAbsent(clientHostId, s -> new IntervalCount(intervalDurationMs)); + long currentCount = intervalCount.resetIfExpiredAndTick(); if (whiteList.contains(clientHostId)) { return 0; } else if (blackList.contains(clientHostId)) { return Long.MAX_VALUE; } - IntervalCount intervalCount = hostCounts.computeIfAbsent(clientHostId, s -> new IntervalCount(intervalDurationMs)); - return intervalCount.resetIfExpiredAndTick(); + return currentCount; } public void clean() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index cf141711a5..cda4b1669b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -439,8 +439,6 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement getLatestStmt() { if (latestInsertStmt == null) { -// latestInsertStmt = new PreparedStatement[DataType.values().length]; -// for (DataType type : DataType.values()) { latestInsertStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_LATEST_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + @@ -451,7 +449,6 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem "," + ModelConstants.LONG_VALUE_COLUMN + "," + ModelConstants.DOUBLE_VALUE_COLUMN + ")" + " VALUES(?, ?, ?, ?, ?, ?, ?, ?)"); -// } } return latestInsertStmt; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java index de07dbfa47..2acd623a37 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Component @Slf4j +@NoSqlDao public class BufferedRateLimiter implements AsyncRateLimiter { private final ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); @@ -113,6 +114,9 @@ public class BufferedRateLimiter implements AsyncRateLimiter { lockedFuture.cancelFuture(); return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); } + if(permits.get() < permitsLimit) { + reprocessQueue(); + } return lockedFuture.future; } catch (InterruptedException e) { return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Task interrupted. Reject")); @@ -130,8 +134,8 @@ public class BufferedRateLimiter implements AsyncRateLimiter { expiredCount++; } } - log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}]", maxQueueSize.getAndSet(0), - maxGrantedPermissions.getAndSet(0), expiredCount); + log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}] current granted [{}]", maxQueueSize.getAndSet(0), + maxGrantedPermissions.getAndSet(0), expiredCount, permits.get()); } private class LockedFuture { diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties index 82fcbe1949..737687f053 100644 --- a/dao/src/test/resources/cassandra-test.properties +++ b/dao/src/test/resources/cassandra-test.properties @@ -47,3 +47,8 @@ cassandra.query.default_fetch_size=2000 cassandra.query.ts_key_value_partitioning=HOURS cassandra.query.max_limit_per_request=1000 +cassandra.query.buffer_size=100000 +cassandra.query.concurrent_limit=1000 +cassandra.query.permit_max_wait_time=20000 +cassandra.query.rate_limit_print_interval_ms=30000 + From 94039f943b46caa0dc86ab722fbf0006b9c4acab Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Fri, 23 Mar 2018 16:56:37 +0200 Subject: [PATCH 33/75] Squashed commit of the following: commit 8b637c9e9456963e1e24ec0e6306903d2e765c1f Author: vparomskiy Date: Fri Mar 23 16:54:48 2018 +0200 add cassandra properties in test suite --- .../server/actors/plugin/PluginActorMessageProcessor.java | 1 + application/src/main/resources/thingsboard.yml | 4 ++-- .../server/dao/timeseries/CassandraBaseTimeseriesDao.java | 3 --- .../thingsboard/server/dao/util/BufferedRateLimiter.java | 8 ++++++-- dao/src/test/resources/cassandra-test.properties | 5 +++++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java index 51ca652d6f..f6bf54d349 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActorMessageProcessor.java @@ -106,6 +106,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor try { pluginImpl.process(trustedCtx, msg.getRuleTenantId(), msg.getRuleId(), msg.getMsg()); } catch (Exception ex) { + logger.debug("[{}] Failed to process RuleToPlugin msg: [{}] [{}]", tenantId, msg.getMsg(), ex); RuleToPluginMsg ruleMsg = msg.getMsg(); MsgType responceMsgType = MsgType.RULE_ENGINE_ERROR; Integer requestId = 0; diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index ff5824dbfd..fc04a193e1 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -133,7 +133,7 @@ quota: intervalMin: 2 database: - type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql + type: "${DATABASE_TYPE:sql}" # cassandra OR sql # Cassandra driver configuration parameters cassandra: @@ -238,7 +238,7 @@ caffeine: specs: relations: timeToLiveInMinutes: 1440 - maxSize: 0 + maxSize: 100000 deviceCredentials: timeToLiveInMinutes: 1440 maxSize: 100000 diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index cf141711a5..cda4b1669b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -439,8 +439,6 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem private PreparedStatement getLatestStmt() { if (latestInsertStmt == null) { -// latestInsertStmt = new PreparedStatement[DataType.values().length]; -// for (DataType type : DataType.values()) { latestInsertStmt = prepare(INSERT_INTO + ModelConstants.TS_KV_LATEST_CF + "(" + ModelConstants.ENTITY_TYPE_COLUMN + "," + ModelConstants.ENTITY_ID_COLUMN + @@ -451,7 +449,6 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem "," + ModelConstants.LONG_VALUE_COLUMN + "," + ModelConstants.DOUBLE_VALUE_COLUMN + ")" + " VALUES(?, ?, ?, ?, ?, ?, ?, ?)"); -// } } return latestInsertStmt; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java index de07dbfa47..2acd623a37 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Component @Slf4j +@NoSqlDao public class BufferedRateLimiter implements AsyncRateLimiter { private final ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); @@ -113,6 +114,9 @@ public class BufferedRateLimiter implements AsyncRateLimiter { lockedFuture.cancelFuture(); return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); } + if(permits.get() < permitsLimit) { + reprocessQueue(); + } return lockedFuture.future; } catch (InterruptedException e) { return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Task interrupted. Reject")); @@ -130,8 +134,8 @@ public class BufferedRateLimiter implements AsyncRateLimiter { expiredCount++; } } - log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}]", maxQueueSize.getAndSet(0), - maxGrantedPermissions.getAndSet(0), expiredCount); + log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}] current granted [{}]", maxQueueSize.getAndSet(0), + maxGrantedPermissions.getAndSet(0), expiredCount, permits.get()); } private class LockedFuture { diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties index 82fcbe1949..737687f053 100644 --- a/dao/src/test/resources/cassandra-test.properties +++ b/dao/src/test/resources/cassandra-test.properties @@ -47,3 +47,8 @@ cassandra.query.default_fetch_size=2000 cassandra.query.ts_key_value_partitioning=HOURS cassandra.query.max_limit_per_request=1000 +cassandra.query.buffer_size=100000 +cassandra.query.concurrent_limit=1000 +cassandra.query.permit_max_wait_time=20000 +cassandra.query.rate_limit_print_interval_ms=30000 + From 05f92cbe656478626a83db0cbdb9da2698f91ac1 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 23 Mar 2018 19:29:48 +0200 Subject: [PATCH 34/75] Fixed installation script --- .../service/install/DefaultSystemDataLoaderService.java | 4 ++-- application/src/main/resources/thingsboard.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java index 1ef805f3c9..908faf2315 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java @@ -187,7 +187,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @Override public void loadSystemRules() throws Exception { - loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null); +// loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null); } @Override @@ -228,7 +228,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { "Raspberry Pi GPIO control sample application"); loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); - loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); +// loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null); } diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index ff5824dbfd..c08de4f1b8 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -133,7 +133,7 @@ quota: intervalMin: 2 database: - type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql + type: "${DATABASE_TYPE:sql}" # cassandra OR sql # Cassandra driver configuration parameters cassandra: From 7b1a39fb68f153daf2f48c7aa7198d4deaab95d3 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 23 Mar 2018 20:59:26 +0200 Subject: [PATCH 35/75] Rule Chain hover and select improvements. --- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 11 +++++ ui/src/app/rulechain/rulechain.scss | 51 ++++++++++++++++---- ui/src/app/rulechain/rulechain.tpl.html | 7 +++ ui/src/app/rulechain/rulenode.tpl.html | 1 + 5 files changed, 62 insertions(+), 9 deletions(-) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index cca2a11648..a7b2b443da 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1177,6 +1177,7 @@ export default angular.module('thingsboard.locale', []) "type": "Type", "description": "Description", "delete": "Delete rule node", + "delete-selected-objects": "Delete selected nodes and connections", "rulenode-details": "Rule node details", "debug-mode": "Debug mode", "configuration": "Configuration", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index b792f138f8..565e72b444 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -81,6 +81,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.saveRuleChain = saveRuleChain; vm.revertRuleChain = revertRuleChain; + vm.objectsSelected = objectsSelected; + vm.deleteSelected = deleteSelected; + vm.keyDown = function (evt) { if (evt.keyCode === ctrlKeyCode) { vm.ctrlDown = true; @@ -632,6 +635,14 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }); } + function objectsSelected() { + return vm.modelservice.nodes.getSelectedNodes().length > 0 || + vm.modelservice.edges.getSelectedEdges().length > 0 + } + + function deleteSelected() { + vm.modelservice.deleteSelected(); + } } /*@ngInject*/ diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index 26a5225a68..c1d1376d50 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -121,10 +121,6 @@ .fc-node { z-index: 1; outline: none; - &.fc-hover, &.fc-selected { - -webkit-filter: brightness(70%); - filter: brightness(70%); - } &.fc-dragging { z-index: 10; } @@ -132,6 +128,26 @@ padding: 0 15px; text-align: center; } + .fc-node-overlay { + position: absolute; + pointer-events: none; + left: 0; + top: 0; + right: 0; + bottom: 0; + background-color: #000; + opacity: 0; + } + &.fc-hover { + .fc-node-overlay { + opacity: 0.25; + } + } + &.fc-selected { + .fc-node-overlay { + opacity: 0.25; + } + } } .fc-leftConnectors, .fc-rightConnectors { @@ -181,6 +197,7 @@ stroke: gray; stroke-width: 4; fill: transparent; + transition: stroke-width .2s; &.fc-selected { stroke: red; stroke-width: 4; @@ -232,20 +249,29 @@ .fc-edge-label { position: absolute; user-select: none; - pointer-events: none; + transition: transform .2s; opacity: 0.8; + &.fc-hover { + transform: scale(1.25); + } + &.fc-selected { + .fc-edge-label-text { + span { + border: solid red; + color: red; + } + } + } } .fc-edge-label-text { position: absolute; - left: 50%; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); white-space: nowrap; text-align: center; font-size: 14px; font-weight: 600; - top: 5px; span { border: solid 2px #003a79; border-radius: 10px; @@ -255,6 +281,13 @@ } } +.fc-select-rectangle { + border: 2px dashed #5262ff; + position: absolute; + background: rgba(20,125,255,0.1); + z-index: 2; +} + @keyframes dash { from { stroke-dashoffset: 500; diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 9f1141e887..eec376ea42 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -112,6 +112,13 @@

+ + + {{ 'rulenode.delete-selected-objects' | translate }} + + + +
{{node.icon}} From b578402f116bebccb4189ce893036666ba1b1861 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 26 Mar 2018 16:00:25 +0300 Subject: [PATCH 36/75] Rule chain edit improvements. --- .../components/confirm-on-exit.directive.js | 19 +-- ui/src/app/locale/locale.constant.js | 2 + ui/src/app/rulechain/rulechain.controller.js | 155 ++++++++++-------- ui/src/app/rulechain/rulechain.routes.js | 5 + ui/src/app/rulechain/rulechain.scss | 38 ++++- ui/src/app/rulechain/rulechain.tpl.html | 8 +- 6 files changed, 140 insertions(+), 87 deletions(-) diff --git a/ui/src/app/components/confirm-on-exit.directive.js b/ui/src/app/components/confirm-on-exit.directive.js index fe9a9bdddd..e04e1102a9 100644 --- a/ui/src/app/components/confirm-on-exit.directive.js +++ b/ui/src/app/components/confirm-on-exit.directive.js @@ -18,17 +18,17 @@ export default angular.module('thingsboard.directives.confirmOnExit', []) .name; /*@ngInject*/ -function ConfirmOnExit($state, $mdDialog, $window, $filter, userService) { +function ConfirmOnExit($state, $mdDialog, $window, $filter, $parse, userService) { return { - link: function ($scope) { - + link: function ($scope, $element, $attributes) { + $scope.confirmForm = $scope.$eval($attributes.confirmForm); $window.onbeforeunload = function () { - if (userService.isAuthenticated() && (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.isDirty)) { + if (userService.isAuthenticated() && (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.$eval($attributes.isDirty))) { return $filter('translate')('confirm-on-exit.message'); } } $scope.$on('$stateChangeStart', function (event, next, current, params) { - if (userService.isAuthenticated() && (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.isDirty)) { + if (userService.isAuthenticated() && (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.$eval($attributes.isDirty))) { event.preventDefault(); var confirm = $mdDialog.confirm() .title($filter('translate')('confirm-on-exit.title')) @@ -40,7 +40,9 @@ function ConfirmOnExit($state, $mdDialog, $window, $filter, userService) { if ($scope.confirmForm) { $scope.confirmForm.$setPristine(); } else { - $scope.isDirty = false; + var remoteSetter = $parse($attributes.isDirty).assign; + remoteSetter($scope, false); + //$scope.isDirty = false; } $state.go(next.name, params); }, function () { @@ -48,9 +50,6 @@ function ConfirmOnExit($state, $mdDialog, $window, $filter, userService) { } }); }, - scope: { - confirmForm: '=', - isDirty: '=' - } + scope: false }; } \ No newline at end of file diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index a7b2b443da..5dce7872e8 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1177,6 +1177,8 @@ export default angular.module('thingsboard.locale', []) "type": "Type", "description": "Description", "delete": "Delete rule node", + "select-all": "Select all nodes and connections", + "deselect-all": "Deselect all nodes and connections", "delete-selected-objects": "Delete selected nodes and connections", "rulenode-details": "Rule node details", "debug-mode": "Debug mode", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 565e72b444..4eba5b2c52 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -27,15 +27,10 @@ import addRuleNodeLinkTemplate from './add-link.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ - -const deleteKeyCode = 46; -const ctrlKeyCode = 17; -const aKeyCode = 65; -const escKeyCode = 27; - /*@ngInject*/ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, $timeout, $mdExpansionPanel, $document, $mdDialog, - $filter, $translate, types, ruleChainService, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData) { + $filter, $translate, hotkeys, types, ruleChainService, Modelfactory, flowchartConstants, + ruleChain, ruleChainMetaData, ruleNodeComponents) { var vm = this; @@ -76,42 +71,62 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.modelservice = Modelfactory(vm.ruleChainModel, vm.selectedObjects); - vm.ctrlDown = false; - vm.saveRuleChain = saveRuleChain; vm.revertRuleChain = revertRuleChain; vm.objectsSelected = objectsSelected; vm.deleteSelected = deleteSelected; - vm.keyDown = function (evt) { - if (evt.keyCode === ctrlKeyCode) { - vm.ctrlDown = true; - evt.stopPropagation(); - evt.preventDefault(); - } - }; - - vm.keyUp = function (evt) { - - if (evt.keyCode === deleteKeyCode) { - vm.modelservice.deleteSelected(); - } - - if (evt.keyCode == aKeyCode && vm.ctrlDown) { - vm.modelservice.selectAll(); - } - - if (evt.keyCode == escKeyCode) { - vm.modelservice.deselectAll(); - } - - if (evt.keyCode === ctrlKeyCode) { - vm.ctrlDown = false; - evt.stopPropagation(); - evt.preventDefault(); - } - }; + initHotKeys(); + + function initHotKeys() { + hotkeys.bindTo($scope) + .add({ + combo: 'ctrl+a', + description: $translate.instant('rulenode.select-all'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + vm.modelservice.selectAll(); + } + }) + .add({ + combo: 'esc', + description: $translate.instant('rulenode.deselect-all'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + vm.modelservice.deselectAll(); + } + }) + .add({ + combo: 'ctrl+s', + description: $translate.instant('action.apply'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + vm.saveRuleChain(); + } + }) + .add({ + combo: 'ctrl+z', + description: $translate.instant('action.decline-changes'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + vm.revertRuleChain(); + } + }) + .add({ + combo: 'del', + description: $translate.instant('rulenode.delete-selected-objects'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + vm.modelservice.deleteSelected(); + } + }) + } vm.onEditRuleNodeClosed = function() { vm.editingRuleNode = null; @@ -289,44 +304,40 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, loadRuleChainLibrary(); function loadRuleChainLibrary() { - ruleChainService.getRuleNodeComponents().then( - (ruleNodeComponents) => { - for (var i=0;i - +
@@ -50,8 +52,6 @@
Date: Mon, 26 Mar 2018 16:58:14 +0300 Subject: [PATCH 37/75] Impl --- .../server/controller/BaseController.java | 7 + .../controller/TelemetryController.java | 472 +++++++++++------- 2 files changed, 303 insertions(+), 176 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index d1c282508b..3294d5fc59 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -57,6 +57,7 @@ import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.rule.RuleService; +import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.widget.WidgetTypeService; import org.thingsboard.server.dao.widget.WidgetsBundleService; @@ -85,6 +86,9 @@ public abstract class BaseController { @Autowired private ThingsboardErrorResponseHandler errorResponseHandler; + @Autowired + protected TenantService tenantService; + @Autowired protected CustomerService customerService; @@ -602,5 +606,8 @@ public abstract class BaseController { auditLogService.logEntityAction(user.getTenantId(), customerId, user.getId(), user.getName(), entityId, entity, actionType, e, additionalInfo); } + protected static Exception toException(Throwable error) { + return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); + } } diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index dcc4a5cf54..1944fa2e68 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -9,33 +9,49 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.async.DeferredResult; import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.audit.ActionType; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.exception.ThingsboardException; import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; import org.thingsboard.server.extensions.api.plugins.PluginConstants; +import org.thingsboard.server.extensions.core.plugin.telemetry.AttributeData; import org.thingsboard.server.service.security.model.SecurityUser; import javax.annotation.Nullable; import javax.annotation.PreDestroy; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.function.BiConsumer; import java.util.stream.Collectors; /** @@ -74,61 +90,169 @@ public class TelemetryController extends BaseController { @ResponseStatus(value = HttpStatus.OK) public DeferredResult getAttributeKeys( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { - DeferredResult response = new DeferredResult(); + return validateEntityAndCallback(entityType, entityIdStr, + this::getAttributeKeysCallback, + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES/{scope}", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributeKeysByScope( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr + , @PathVariable("scope") String scope) throws ThingsboardException { + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> getAttributeKeysCallback(result, entityId, scope), + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributes( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { + SecurityUser user = getCurrentUser(); + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr), + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES/{scope}", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getAttributesByScope( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { + SecurityUser user = getCurrentUser(); + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/keys/TIMESERIES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getTimeseriesKeys( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> { + Futures.addCallback(tsService.findAllLatest(entityId), getTsKeysToResponseCallback(result)); + }, + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getLatestTimeseries( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { + SecurityUser user = getCurrentUser(); + + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) + @ResponseStatus(value = HttpStatus.OK) + public DeferredResult getLatestTimeseries( + @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { + SecurityUser user = getCurrentUser(); + + return validateEntityAndCallback(entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), + (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + private DeferredResult validateEntityAndCallback(String entityType, String entityIdStr, + BiConsumer, EntityId> onSuccess, BiConsumer, Throwable> onFailure) throws ThingsboardException { + final DeferredResult response = new DeferredResult<>(); EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); validate(getCurrentUser(), entityId, new ValidationCallback(response, new FutureCallback>() { @Override public void onSuccess(@Nullable DeferredResult result) { - List>> futures = new ArrayList<>(); - for (String scope : DataConstants.allScopes()) { - futures.add(attributesService.findAll(entityId, scope)); - } - - ListenableFuture> future = Futures.transform(Futures.successfulAsList(futures), - (Function>, ? extends List>) input -> { - List tmp = new ArrayList<>(); - if (input != null) { - input.forEach(tmp::addAll); - } - return tmp; - }, executor); - - Futures.addCallback(future, getAttributeKeysPluginCallback(result)); + onSuccess.accept(response, entityId); } @Override public void onFailure(Throwable t) { - handleError(t, response, HttpStatus.INTERNAL_SERVER_ERROR); + onFailure.accept(response, t); } })); return response; } - @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES/{scope}", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) - public DeferredResult getAttributeKeysByScope() { - return null; + private void getAttributeValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, String scope, String keys) { + List keyList = null; + if (!StringUtils.isEmpty(keys)) { + keyList = Arrays.asList(keys.split(",")); + } + FutureCallback> callback = getAttributeValuesToResponseCallback(result, user, scope, entityId, keyList); + if (!StringUtils.isEmpty(scope)) { + if (keyList != null && !keyList.isEmpty()) { + Futures.addCallback(attributesService.find(entityId, scope, keyList), callback); + } else { + Futures.addCallback(attributesService.findAll(entityId, scope), callback); + } + } else { + List>> futures = new ArrayList<>(); + for (String tmpScope : DataConstants.allScopes()) { + if (keyList != null && !keyList.isEmpty()) { + futures.add(attributesService.find(entityId, tmpScope, keyList)); + } else { + futures.add(attributesService.findAll(entityId, tmpScope)); + } + } + + ListenableFuture> future = mergeAllAttributesFutures(futures); + + Futures.addCallback(future, callback); + } } - @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) - public DeferredResult getAttributeValues() { - return null; + private void getAttributeKeysCallback(@Nullable DeferredResult result, EntityId entityId, String scope) { + Futures.addCallback(attributesService.findAll(entityId, scope), getAttributeKeysToResponseCallback(result)); } - @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) - public DeferredResult getAttributeValuesByScope() { - return null; + private void getAttributeKeysCallback(@Nullable DeferredResult result, EntityId entityId) { + List>> futures = new ArrayList<>(); + for (String scope : DataConstants.allScopes()) { + futures.add(attributesService.findAll(entityId, scope)); + } + + ListenableFuture> future = mergeAllAttributesFutures(futures); + + Futures.addCallback(future, getAttributeKeysToResponseCallback(result)); + } + + private FutureCallback> getTsKeysToResponseCallback(final DeferredResult response) { + return new FutureCallback>() { + @Override + public void onSuccess(List values) { + List keys = values.stream().map(KvEntry::getKey).collect(Collectors.toList()); + response.setResult(new ResponseEntity<>(keys, HttpStatus.OK)); + } + + @Override + public void onFailure(Throwable e) { + log.error("Failed to fetch attributes", e); + handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + } + }; } - private FutureCallback> getAttributeKeysPluginCallback(final DeferredResult response) { + private FutureCallback> getAttributeKeysToResponseCallback(final DeferredResult response) { return new FutureCallback>() { @Override @@ -145,6 +269,40 @@ public class TelemetryController extends BaseController { }; } + private FutureCallback> getAttributeValuesToResponseCallback(final DeferredResult response, final SecurityUser user, final String scope, + final EntityId entityId, final List keyList) { + return new FutureCallback>() { + @Override + public void onSuccess(List attributes) { + List values = attributes.stream().map(attribute -> new AttributeData(attribute.getLastUpdateTs(), + attribute.getKey(), attribute.getValue())).collect(Collectors.toList()); + logAttributesRead(user, entityId, scope, keyList, null); + response.setResult(new ResponseEntity<>(values, HttpStatus.OK)); + } + + @Override + public void onFailure(Throwable e) { + log.error("Failed to fetch attributes", e); + logAttributesRead(user, entityId, scope, keyList, e); + handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + } + }; + } + + private void logAttributesRead(SecurityUser user, EntityId entityId, String scope, List keys, Throwable e) { + auditLogService.logEntityAction( + user.getTenantId(), + user.getCustomerId(), + user.getId(), + user.getName(), + (UUIDBased & EntityId) entityId, + null, + ActionType.ATTRIBUTES_READ, + toException(e), + scope, + keys); + } + private void handleError(Throwable e, final DeferredResult response, HttpStatus defaultErrorStatus) { ResponseEntity responseEntity; if (e != null && e instanceof ToErrorResponseEntity) { @@ -162,24 +320,18 @@ public class TelemetryController extends BaseController { case DEVICE: validateDevice(currentUser, entityId, callback); return; -// case ASSET: -// validateAsset(ctx, entityId, callback); -// return; -// case RULE: -// validateRule(ctx, entityId, callback); -// return; -// case RULE_CHAIN: -// validateRuleChain(ctx, entityId, callback); -// return; -// case PLUGIN: -// validatePlugin(ctx, entityId, callback); -// return; -// case CUSTOMER: -// validateCustomer(ctx, entityId, callback); -// return; -// case TENANT: -// validateTenant(ctx, entityId, callback); -// return; + case ASSET: + validateAsset(currentUser, entityId, callback); + return; + case RULE_CHAIN: + validateRuleChain(currentUser, entityId, callback); + return; + case CUSTOMER: + validateCustomer(currentUser, entityId, callback); + return; + case TENANT: + validateTenant(currentUser, entityId, callback); + return; default: //TODO: add support of other entities throw new IllegalStateException("Not Implemented!"); @@ -207,6 +359,89 @@ public class TelemetryController extends BaseController { } } + private void validateAsset(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture assetFuture = assetService.findAssetByIdAsync(new AssetId(entityId.getId())); + Futures.addCallback(assetFuture, getCallback(callback, asset -> { + if (asset == null) { + return ValidationResult.entityNotFound("Asset with requested id wasn't found!"); + } else { + if (!asset.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Asset doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !asset.getCustomerId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + + private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isCustomerUser()) { + callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture ruleChainFuture = ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); + Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { + if (ruleChain == null) { + return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); + } else { + if (currentUser.isTenantAdmin() && !ruleChain.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); + } else if (currentUser.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { + return ValidationResult.accessDenied("Rule chain is not in system scope!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validateCustomer(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture customerFuture = customerService.findCustomerByIdAsync(new CustomerId(entityId.getId())); + Futures.addCallback(customerFuture, getCallback(callback, customer -> { + if (customer == null) { + return ValidationResult.entityNotFound("Customer with requested id wasn't found!"); + } else { + if (!customer.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Customer doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !customer.getId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validateTenant(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isCustomerUser()) { + callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.ok()); + } else { + ListenableFuture tenantFuture = tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); + Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { + if (tenant == null) { + return ValidationResult.entityNotFound("Tenant with requested id wasn't found!"); + } else if (!tenant.getId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); + } else { + return ValidationResult.ok(); + } + })); + } + } + private FutureCallback getCallback(ValidationCallback callback, Function transformer) { return new FutureCallback() { @Override @@ -220,131 +455,16 @@ public class TelemetryController extends BaseController { } }; } -// -// private void validateAsset(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isSystemAdmin()) { -// callback.onSuccess(this, ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else { -// ListenableFuture assetFuture = pluginCtx.assetService.findAssetByIdAsync(new AssetId(entityId.getId())); -// Futures.addCallback(assetFuture, getCallback(callback, asset -> { -// if (asset == null) { -// return ValidationResult.entityNotFound("Asset with requested id wasn't found!"); -// } else { -// if (!asset.getTenantId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Asset doesn't belong to the current Tenant!"); -// } else if (ctx.isCustomerUser() && !asset.getCustomerId().equals(ctx.getCustomerId())) { -// return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); -// } else { -// return ValidationResult.ok(); -// } -// } -// })); -// } -// } -// -// private void validateRule(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isCustomerUser()) { -// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else { -// ListenableFuture ruleFuture = pluginCtx.ruleService.findRuleByIdAsync(new RuleId(entityId.getId())); -// Futures.addCallback(ruleFuture, getCallback(callback, rule -> { -// if (rule == null) { -// return ValidationResult.entityNotFound("Rule with requested id wasn't found!"); -// } else { -// if (ctx.isTenantAdmin() && !rule.getTenantId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Rule doesn't belong to the current Tenant!"); -// } else if (ctx.isSystemAdmin() && !rule.getTenantId().isNullUid()) { -// return ValidationResult.accessDenied("Rule is not in system scope!"); -// } else { -// return ValidationResult.ok(); -// } -// } -// })); -// } -// } -// -// private void validateRuleChain(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isCustomerUser()) { -// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else { -// ListenableFuture ruleChainFuture = pluginCtx.ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); -// Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { -// if (ruleChain == null) { -// return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); -// } else { -// if (ctx.isTenantAdmin() && !ruleChain.getTenantId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); -// } else if (ctx.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { -// return ValidationResult.accessDenied("Rule chain is not in system scope!"); -// } else { -// return ValidationResult.ok(); -// } -// } -// })); -// } -// } -// -// -// private void validatePlugin(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isCustomerUser()) { -// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else { -// ListenableFuture pluginFuture = pluginCtx.pluginService.findPluginByIdAsync(new PluginId(entityId.getId())); -// Futures.addCallback(pluginFuture, getCallback(callback, plugin -> { -// if (plugin == null) { -// return ValidationResult.entityNotFound("Plugin with requested id wasn't found!"); -// } else { -// if (ctx.isTenantAdmin() && !plugin.getTenantId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Plugin doesn't belong to the current Tenant!"); -// } else if (ctx.isSystemAdmin() && !plugin.getTenantId().isNullUid()) { -// return ValidationResult.accessDenied("Plugin is not in system scope!"); -// } else { -// return ValidationResult.ok(); -// } -// } -// })); -// } -// } -// -// private void validateCustomer(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isSystemAdmin()) { -// callback.onSuccess(this, ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else { -// ListenableFuture customerFuture = pluginCtx.customerService.findCustomerByIdAsync(new CustomerId(entityId.getId())); -// Futures.addCallback(customerFuture, getCallback(callback, customer -> { -// if (customer == null) { -// return ValidationResult.entityNotFound("Customer with requested id wasn't found!"); -// } else { -// if (!customer.getTenantId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Customer doesn't belong to the current Tenant!"); -// } else if (ctx.isCustomerUser() && !customer.getId().equals(ctx.getCustomerId())) { -// return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); -// } else { -// return ValidationResult.ok(); -// } -// } -// })); -// } -// } -// -// private void validateTenant(final PluginApiCallSecurityContext ctx, EntityId entityId, ValidationCallback callback) { -// if (ctx.isCustomerUser()) { -// callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); -// } else if (ctx.isSystemAdmin()) { -// callback.onSuccess(this, ValidationResult.ok()); -// } else { -// ListenableFuture tenantFuture = pluginCtx.tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); -// Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { -// if (tenant == null) { -// return ValidationResult.entityNotFound("Tenant with requested id wasn't found!"); -// } else if (!tenant.getId().equals(ctx.getTenantId())) { -// return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); -// } else { -// return ValidationResult.ok(); -// } -// })); -// } -// } + private ListenableFuture> mergeAllAttributesFutures(List>> futures) { + return Futures.transform(Futures.successfulAsList(futures), + (Function>, ? extends List>) input -> { + List tmp = new ArrayList<>(); + if (input != null) { + input.forEach(tmp::addAll); + } + return tmp; + }, executor); + } } From 54b272c04f9370a9f4e106cade3c511959fc9a18 Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Tue, 27 Mar 2018 13:16:48 +0300 Subject: [PATCH 38/75] return permit if request expired/canceled --- .../dao/exception/BufferLimitException.java | 25 +++++++++++++++ .../dao/nosql/RateLimitedResultSetFuture.java | 14 +++++--- .../server/dao/util/BufferedRateLimiter.java | 21 +++++++++--- .../nosql/RateLimitedResultSetFutureTest.java | 32 +++++++++++++++++-- .../dao/util/BufferedRateLimiterTest.java | 5 +-- 5 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/exception/BufferLimitException.java diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/BufferLimitException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/BufferLimitException.java new file mode 100644 index 0000000000..3334dc62a9 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/exception/BufferLimitException.java @@ -0,0 +1,25 @@ +/** + * Copyright © 2016-2018 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.dao.exception; + +public class BufferLimitException extends RuntimeException { + + private static final long serialVersionUID = 4513762009041887588L; + + public BufferLimitException() { + super("Rate Limit Buffer is full"); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java index 2674c6ddea..d2505632d7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFuture.java @@ -24,6 +24,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; +import org.thingsboard.server.dao.exception.BufferLimitException; import org.thingsboard.server.dao.util.AsyncRateLimiter; import javax.annotation.Nullable; @@ -35,9 +36,15 @@ public class RateLimitedResultSetFuture implements ResultSetFuture { private final ListenableFuture rateLimitFuture; public RateLimitedResultSetFuture(Session session, AsyncRateLimiter rateLimiter, Statement statement) { - this.rateLimitFuture = rateLimiter.acquireAsync(); + this.rateLimitFuture = Futures.withFallback(rateLimiter.acquireAsync(), t -> { + if (!(t instanceof BufferLimitException)) { + rateLimiter.release(); + } + return Futures.immediateFailedFuture(t); + }); this.originalFuture = Futures.transform(rateLimitFuture, (Function) i -> executeAsyncWithRelease(rateLimiter, session, statement)); + } @Override @@ -108,10 +115,7 @@ public class RateLimitedResultSetFuture implements ResultSetFuture { try { ResultSetFuture resultSetFuture = Uninterruptibles.getUninterruptibly(originalFuture); resultSetFuture.addListener(listener, executor); - } catch (CancellationException e) { - cancel(false); - return; - } catch (ExecutionException e) { + } catch (CancellationException | ExecutionException e) { Futures.immediateFailedFuture(e).addListener(listener, executor); } }, executor); diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java index 2acd623a37..03eb46f1ab 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateLimiter.java @@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.thingsboard.server.dao.exception.BufferLimitException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; @@ -41,6 +42,9 @@ public class BufferedRateLimiter implements AsyncRateLimiter { private final AtomicInteger maxQueueSize = new AtomicInteger(); private final AtomicInteger maxGrantedPermissions = new AtomicInteger(); + private final AtomicInteger totalGranted = new AtomicInteger(); + private final AtomicInteger totalReleased = new AtomicInteger(); + private final AtomicInteger totalRequested = new AtomicInteger(); public BufferedRateLimiter(@Value("${cassandra.query.buffer_size}") int queueLimit, @Value("${cassandra.query.concurrent_limit}") int permitsLimit, @@ -53,11 +57,13 @@ public class BufferedRateLimiter implements AsyncRateLimiter { @Override public ListenableFuture acquireAsync() { + totalRequested.incrementAndGet(); if (queue.isEmpty()) { if (permits.incrementAndGet() <= permitsLimit) { if (permits.get() > maxGrantedPermissions.get()) { maxGrantedPermissions.set(permits.get()); } + totalGranted.incrementAndGet(); return Futures.immediateFuture(null); } permits.decrementAndGet(); @@ -69,6 +75,7 @@ public class BufferedRateLimiter implements AsyncRateLimiter { @Override public void release() { permits.decrementAndGet(); + totalReleased.incrementAndGet(); reprocessQueue(); } @@ -80,6 +87,7 @@ public class BufferedRateLimiter implements AsyncRateLimiter { } LockedFuture lockedFuture = queue.poll(); if (lockedFuture != null) { + totalGranted.incrementAndGet(); lockedFuture.latch.countDown(); } else { permits.decrementAndGet(); @@ -112,17 +120,17 @@ public class BufferedRateLimiter implements AsyncRateLimiter { LockedFuture lockedFuture = createLockedFuture(); if (!queue.offer(lockedFuture, 1, TimeUnit.SECONDS)) { lockedFuture.cancelFuture(); - return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); + return Futures.immediateFailedFuture(new BufferLimitException()); } if(permits.get() < permitsLimit) { reprocessQueue(); } return lockedFuture.future; } catch (InterruptedException e) { - return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Task interrupted. Reject")); + return Futures.immediateFailedFuture(new BufferLimitException()); } } - return Futures.immediateFailedFuture(new IllegalStateException("Rate Limit Buffer is full. Reject")); + return Futures.immediateFailedFuture(new BufferLimitException()); } @Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}") @@ -134,8 +142,11 @@ public class BufferedRateLimiter implements AsyncRateLimiter { expiredCount++; } } - log.info("Permits maxBuffer is [{}] max concurrent [{}] expired [{}] current granted [{}]", maxQueueSize.getAndSet(0), - maxGrantedPermissions.getAndSet(0), expiredCount, permits.get()); + log.info("Permits maxBuffer [{}] maxPermits [{}] expired [{}] currPermits [{}] currBuffer [{}] " + + "totalPermits [{}] totalRequests [{}] totalReleased [{}]", + maxQueueSize.getAndSet(0), maxGrantedPermissions.getAndSet(0), expiredCount, + permits.get(), queue.size(), + totalGranted.getAndSet(0), totalRequested.getAndSet(0), totalReleased.getAndSet(0)); } private class LockedFuture { diff --git a/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java b/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java index fa62c2b9b0..f49668d3fd 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/nosql/RateLimitedResultSetFutureTest.java @@ -19,16 +19,17 @@ import com.datastax.driver.core.*; import com.datastax.driver.core.exceptions.UnsupportedFeatureException; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; +import org.thingsboard.server.dao.exception.BufferLimitException; import org.thingsboard.server.dao.util.AsyncRateLimiter; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -53,7 +54,7 @@ public class RateLimitedResultSetFutureTest { @Test public void doNotReleasePermissionIfRateLimitFutureFailed() throws InterruptedException { - when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFailedFuture(new IllegalArgumentException())); + when(rateLimiter.acquireAsync()).thenReturn(Futures.immediateFailedFuture(new BufferLimitException())); resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); Thread.sleep(1000L); verify(rateLimiter).acquireAsync(); @@ -153,4 +154,29 @@ public class RateLimitedResultSetFutureTest { verify(rateLimiter, times(1)).release(); } + @Test + public void expiredQueryReturnPermit() throws InterruptedException, ExecutionException { + CountDownLatch latch = new CountDownLatch(1); + ListenableFuture future = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(1)).submit(() -> { + latch.await(); + return null; + }); + when(rateLimiter.acquireAsync()).thenReturn(future); + resultSetFuture = new RateLimitedResultSetFuture(session, rateLimiter, statement); + + ListenableFuture transform = Futures.transform(resultSetFuture, ResultSet::one); +// TimeUnit.MILLISECONDS.sleep(200); + future.cancel(false); + latch.countDown(); + + try { + transform.get(); + fail(); + } catch (Exception e) { + assertTrue(e instanceof ExecutionException); + } + verify(rateLimiter, times(1)).acquireAsync(); + verify(rateLimiter, times(1)).release(); + } + } \ No newline at end of file diff --git a/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java b/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java index 5bfc3b6e95..67c3ce8d73 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/util/BufferedRateLimiterTest.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.util; import com.google.common.util.concurrent.*; import org.junit.Test; +import org.thingsboard.server.dao.exception.BufferLimitException; import javax.annotation.Nullable; import java.util.concurrent.ExecutionException; @@ -61,8 +62,8 @@ public class BufferedRateLimiterTest { } catch (Exception e) { assertTrue(e instanceof ExecutionException); Throwable actualCause = e.getCause(); - assertTrue(actualCause instanceof IllegalStateException); - assertEquals("Rate Limit Buffer is full. Reject", actualCause.getMessage()); + assertTrue(actualCause instanceof BufferLimitException); + assertEquals("Rate Limit Buffer is full", actualCause.getMessage()); } } From 2f6995fcedb0f795429a3d4b0ad1c7fb687314c7 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 27 Mar 2018 16:59:41 +0300 Subject: [PATCH 39/75] Fix for UI build. --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index ad95ef4a7a..ad9a7a67a3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@flowjs/ng-flow": "^2.7.1", - "ace-builds": "^1.2.5", + "ace-builds": "1.3.1", "angular": "1.5.8", "angular-animate": "1.5.8", "angular-aria": "1.5.8", From fd1199ee1c3927c53377d40e750aaae7d8b72e06 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 28 Mar 2018 11:03:11 +0300 Subject: [PATCH 40/75] RuleNode Config UI --- .../AnnotationComponentDiscoveryService.java | 2 + pom.xml | 1 + .../rule/engine/api/NodeDefinition.java | 2 + .../thingsboard/rule/engine/api/RuleNode.java | 4 + .../rule/engine/filter/TbJsFilterNode.java | 5 +- .../static/rulenode/rulenode-core-config.js | 2 + ui/server.js | 21 ++++++ ui/src/app/api/rule-chain.service.js | 59 +++++++++++++-- ui/src/app/components/js-func.directive.js | 34 +++++++-- ui/src/app/components/js-func.scss | 10 ++- ui/src/app/components/js-func.tpl.html | 15 ++-- ui/src/app/locale/locale.constant.js | 4 +- ui/src/app/rulechain/index.js | 4 + ui/src/app/rulechain/rulechain.controller.js | 21 +++--- .../rulechain/rulenode-config.directive.js | 73 +++++++++++++++++++ ui/src/app/rulechain/rulenode-config.tpl.html | 32 ++++++++ .../rulenode-defined-config.directive.js | 63 ++++++++++++++++ .../app/rulechain/rulenode-fieldset.tpl.html | 9 ++- ui/src/app/rulechain/rulenode.scss | 6 ++ 19 files changed, 336 insertions(+), 31 deletions(-) create mode 100644 rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js create mode 100644 ui/src/app/rulechain/rulenode-config.directive.js create mode 100644 ui/src/app/rulechain/rulenode-config.tpl.html create mode 100644 ui/src/app/rulechain/rulenode-defined-config.directive.js diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java index 479f424e93..9377756b86 100644 --- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java +++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java @@ -192,6 +192,8 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe NodeConfiguration config = configClazz.newInstance(); NodeConfiguration defaultConfiguration = config.defaultConfiguration(); nodeDefinition.setDefaultConfiguration(mapper.valueToTree(defaultConfiguration)); + nodeDefinition.setUiResources(nodeAnnotation.uiResources()); + nodeDefinition.setConfigDirective(nodeAnnotation.configDirective()); return nodeDefinition; } diff --git a/pom.xml b/pom.xml index f0c915a5b0..a90a8aa857 100755 --- a/pom.xml +++ b/pom.xml @@ -284,6 +284,7 @@ src/sh/** src/main/scripts/control/** src/main/scripts/windows/** + src/main/resources/public/static/rulenode/** JAVADOC_STYLE diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java index 6c57d92a54..18b2b941ad 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeDefinition.java @@ -29,5 +29,7 @@ public class NodeDefinition { String[] relationTypes; boolean customRelations; JsonNode defaultConfiguration; + String[] uiResources; + String configDirective; } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java index 16170347a7..eea92ed00a 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleNode.java @@ -45,6 +45,10 @@ public @interface RuleNode { String[] relationTypes() default {"Success", "Failure"}; + String[] uiResources() default {}; + + String configDirective() default ""; + boolean customRelations() default false; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 07b166db68..c684b200c5 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -35,7 +35,10 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If True - send Message via True chain, otherwise False chain is used." + "Message payload can be accessed via msg property. For example msg.temperature < 10;" + - "Message metadata can be accessed via meta property. For example meta.customerName === 'John';") + "Message metadata can be accessed via meta property. For example meta.customerName === 'John';", + uiResources = {"static/rulenode/rulenode-core-config.js"}, + configDirective = "tbFilterNodeScriptConfig") + public class TbJsFilterNode implements TbNode { private TbJsFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js new file mode 100644 index 0000000000..f254cf599d --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -0,0 +1,2 @@ +!function(e){function t(r){if(n[r])return n[r].exports;var u=n[r]={exports:{},id:r,loaded:!1};return e[r].call(u.exports,u,u.exports,t),u.loaded=!0,u.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}([function(e,t,n){e.exports=n(3)},function(e,t){e.exports='
'},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function u(e){var t=function(t,n,r,u){var o=i.default;n.html(o),t.$watch("configuration",function(e,n){angular.equals(e,n)||u.$setViewValue(t.configuration)}),u.$render=function(){t.configuration=u.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}u.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=u;var o=n(1),i=r(o)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var u=n(2),o=r(u),i=n(5),a=r(i);t.default=angular.module("thingsboard.ruleChain.config",[]).directive("tbFilterNodeScriptConfig",o.default).config(a.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function u(e,t){(0,i.default)(t);for(var n in t){var r=t[n];e.translations(n,r)}}u.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=u;var o=n(4),i=r(o)}]); +//# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file diff --git a/ui/server.js b/ui/server.js index fae132f02f..0513600afd 100644 --- a/ui/server.js +++ b/ui/server.js @@ -30,6 +30,10 @@ const httpProxy = require('http-proxy'); const forwardHost = 'localhost'; const forwardPort = 8080; +const ruleNodeUiforwardHost = 'localhost'; +const ruleNodeUiforwardPort = 8080; +//const ruleNodeUiforwardPort = 5000; + const app = express(); const server = http.createServer(app); @@ -52,17 +56,34 @@ const apiProxy = httpProxy.createProxyServer({ } }); +const ruleNodeUiApiProxy = httpProxy.createProxyServer({ + target: { + host: ruleNodeUiforwardHost, + port: ruleNodeUiforwardPort + } +}); + apiProxy.on('error', function (err, req, res) { console.warn('API proxy error: ' + err); res.end('Error.'); }); +ruleNodeUiApiProxy.on('error', function (err, req, res) { + console.warn('RuleNode UI API proxy error: ' + err); + res.end('Error.'); +}); + console.info(`Forwarding API requests to http://${forwardHost}:${forwardPort}`); +console.info(`Forwarding Rule Node UI requests to http://${ruleNodeUiforwardHost}:${ruleNodeUiforwardPort}`); app.all('/api/*', (req, res) => { apiProxy.web(req, res); }); +app.all('/static/rulenode/*', (req, res) => { + ruleNodeUiApiProxy.web(req, res); +}); + app.get('*', function(req, res) { res.sendFile(path.join(__dirname, 'src/index.html')); }); diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index ebc48fad61..af14a3f582 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -17,7 +17,7 @@ export default angular.module('thingsboard.api.ruleChain', []) .factory('ruleChainService', RuleChainService).name; /*@ngInject*/ -function RuleChainService($http, $q, $filter, types, componentDescriptorService) { +function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, componentDescriptorService) { var ruleNodeComponents = null; @@ -177,11 +177,18 @@ function RuleChainService($http, $q, $filter, types, componentDescriptorService) } else { loadRuleNodeComponents().then( (components) => { - ruleNodeComponents = components; - ruleNodeComponents.push( - types.ruleChainNodeComponent + resolveRuleNodeComponentsUiResources(components).then( + (components) => { + ruleNodeComponents = components; + ruleNodeComponents.push( + types.ruleChainNodeComponent + ); + deferred.resolve(ruleNodeComponents); + }, + () => { + deferred.reject(); + } ); - deferred.resolve(ruleNodeComponents); }, () => { deferred.reject(); @@ -191,6 +198,48 @@ function RuleChainService($http, $q, $filter, types, componentDescriptorService) return deferred.promise; } + function resolveRuleNodeComponentsUiResources(components) { + var deferred = $q.defer(); + var tasks = []; + for (var i=0;i { + deferred.resolve(components); + }, + () => { + deferred.resolve(components); + } + ); + return deferred.promise; + } + + function resolveRuleNodeComponentUiResources(component) { + var deferred = $q.defer(); + var uiResources = component.configurationDescriptor.nodeDefinition.uiResources; + if (uiResources && uiResources.length) { + var tasks = []; + for (var i=0;i { + deferred.resolve(component); + }, + () => { + component.configurationDescriptor.nodeDefinition.uiResourceLoadError = $translate.instant('rulenode.ui-resources-load-error'); + deferred.resolve(component); + } + ) + } else { + deferred.resolve(component); + } + return deferred.promise; + } + function getRuleNodeComponentByClazz(clazz) { var res = $filter('filter')(ruleNodeComponents, {clazz: clazz}, true); if (res && res.length) { diff --git a/ui/src/app/components/js-func.directive.js b/ui/src/app/components/js-func.directive.js index 33cebdebf0..deb5626826 100644 --- a/ui/src/app/components/js-func.directive.js +++ b/ui/src/app/components/js-func.directive.js @@ -43,6 +43,7 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) { var template = $templateCache.get(jsFuncTemplate); element.html(template); + scope.functionName = attrs.functionName; scope.functionArgs = scope.$eval(attrs.functionArgs); scope.validationArgs = scope.$eval(attrs.validationArgs); scope.resultType = attrs.resultType; @@ -50,6 +51,8 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) { scope.resultType = "nocheck"; } + scope.validationTriggerArg = attrs.validationTriggerArg; + scope.functionValid = true; var Range = ace.acequire("ace/range").Range; @@ -66,11 +69,15 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) { } scope.onFullscreenChanged = function () { + updateEditorSize(); + }; + + function updateEditorSize() { if (scope.js_editor) { scope.js_editor.resize(); scope.js_editor.renderer.updateFull(); } - }; + } scope.jsEditorOptions = { useWrapMode: true, @@ -131,6 +138,9 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) { scope.validate = function () { try { var toValidate = new Function(scope.functionArgsString, scope.functionBody); + if (scope.noValidate) { + return true; + } var res; var validationError; for (var i=0;i -
+
- function({{ functionArgsString }}) { +
-
- } -
-
\ No newline at end of file + +
+
diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 5dce7872e8..b511b56c33 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1198,7 +1198,9 @@ export default angular.module('thingsboard.locale', []) "type-action": "Action", "type-action-details": "Perform special action", "type-rule-chain": "Rule Chain", - "type-rule-chain-details": "Forwards incoming messages to specified Rule Chain" + "type-rule-chain-details": "Forwards incoming messages to specified Rule Chain", + "directive-is-not-loaded": "Defined configuration directive '{{directiveName}}' is not available.", + "ui-resources-load-error": "Failed to load configuration ui resources." }, "rule-plugin": { "management": "Rules and plugins management" diff --git a/ui/src/app/rulechain/index.js b/ui/src/app/rulechain/index.js index 7306762572..c674467d35 100644 --- a/ui/src/app/rulechain/index.js +++ b/ui/src/app/rulechain/index.js @@ -18,6 +18,8 @@ import RuleChainRoutes from './rulechain.routes'; import RuleChainsController from './rulechains.controller'; import {RuleChainController, AddRuleNodeController, AddRuleNodeLinkController} from './rulechain.controller'; import RuleChainDirective from './rulechain.directive'; +import RuleNodeDefinedConfigDirective from './rulenode-defined-config.directive'; +import RuleNodeConfigDirective from './rulenode-config.directive'; import RuleNodeDirective from './rulenode.directive'; import LinkDirective from './link.directive'; @@ -28,6 +30,8 @@ export default angular.module('thingsboard.ruleChain', []) .controller('AddRuleNodeController', AddRuleNodeController) .controller('AddRuleNodeLinkController', AddRuleNodeLinkController) .directive('tbRuleChain', RuleChainDirective) + .directive('tbRuleNodeDefinedConfig', RuleNodeDefinedConfigDirective) + .directive('tbRuleNodeConfig', RuleNodeConfigDirective) .directive('tbRuleNode', RuleNodeDirective) .directive('tbRuleNodeLink', LinkDirective) .name; diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 4eba5b2c52..dd48bb007a 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -137,10 +137,13 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }; vm.saveRuleNode = function(theForm) { - theForm.$setPristine(); - vm.isEditingRuleNode = false; - vm.ruleChainModel.nodes[vm.editingRuleNodeIndex] = vm.editingRuleNode; - vm.editingRuleNode = angular.copy(vm.editingRuleNode); + $scope.$broadcast('form-submit'); + if (theForm.$valid) { + theForm.$setPristine(); + vm.isEditingRuleNode = false; + vm.ruleChainModel.nodes[vm.editingRuleNodeIndex] = vm.editingRuleNode; + vm.editingRuleNode = angular.copy(vm.editingRuleNode); + } }; vm.saveRuleNodeLink = function(theForm) { @@ -309,7 +312,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, var componentType = ruleNodeComponent.type; var model = vm.ruleNodeTypesModel[componentType].model; var node = { - id: model.nodes.length, + id: 'node-lib-' + componentType + '-' + model.nodes.length, component: ruleNodeComponent, name: '', nodeClass: vm.types.ruleNodeType[componentType].nodeClass, @@ -358,7 +361,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.ruleChainModel.nodes.push( { - id: vm.nextNodeID++, + id: 'rule-chain-node-' + vm.nextNodeID++, component: types.inputNodeComponent, name: "", nodeClass: types.ruleNodeType.INPUT.nodeClass, @@ -389,7 +392,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, var component = ruleChainService.getRuleNodeComponentByClazz(ruleNode.type); if (component) { var node = { - id: vm.nextNodeID++, + id: 'rule-chain-node-' + vm.nextNodeID++, ruleNodeId: ruleNode.id, additionalInfo: ruleNode.additionalInfo, configuration: ruleNode.configuration, @@ -466,7 +469,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, var ruleChainNode = ruleChainNodesMap[ruleChainConnection.additionalInfo.ruleChainNodeId]; if (!ruleChainNode) { ruleChainNode = { - id: vm.nextNodeID++, + id: 'rule-chain-node-' + vm.nextNodeID++, additionalInfo: ruleChainConnection.additionalInfo, targetRuleChainId: ruleChainConnection.targetRuleChainId.id, x: ruleChainConnection.additionalInfo.layoutX, @@ -611,7 +614,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, fullscreen: true, targetEvent: $event }).then(function (ruleNode) { - ruleNode.id = vm.nextNodeID++; + ruleNode.id = 'rule-chain-node-' + vm.nextNodeID++; ruleNode.connectors = []; if (ruleNode.component.configurationDescriptor.nodeDefinition.inEnabled) { ruleNode.connectors.push( diff --git a/ui/src/app/rulechain/rulenode-config.directive.js b/ui/src/app/rulechain/rulenode-config.directive.js new file mode 100644 index 0000000000..4b75c793f1 --- /dev/null +++ b/ui/src/app/rulechain/rulenode-config.directive.js @@ -0,0 +1,73 @@ +/* + * Copyright © 2016-2018 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. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import ruleNodeConfigTemplate from './rulenode-config.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function RuleNodeConfigDirective($compile, $templateCache, $injector, $translate) { + + var linker = function (scope, element, attrs, ngModelCtrl) { + var template = $templateCache.get(ruleNodeConfigTemplate); + element.html(template); + + scope.$watch('configuration', function (newVal, prevVal) { + if (!angular.equals(newVal, prevVal)) { + ngModelCtrl.$setViewValue(scope.configuration); + } + }); + + ngModelCtrl.$render = function () { + scope.configuration = ngModelCtrl.$viewValue; + }; + + scope.useDefinedDirective = function() { + return scope.nodeDefinition.configDirective && !scope.definedDirectiveError; + }; + + validateDefinedDirective(); + + function validateDefinedDirective() { + if (scope.nodeDefinition.uiResourceLoadError && scope.nodeDefinition.uiResourceLoadError.length) { + scope.definedDirectiveError = scope.nodeDefinition.uiResourceLoadError; + } else { + var definedDirective = scope.nodeDefinition.configDirective; + if (definedDirective && definedDirective.length) { + if (!$injector.has(definedDirective + 'Directive')) { + scope.definedDirectiveError = $translate.instant('rulenode.directive-is-not-loaded', {directiveName: definedDirective}); + } + } + } + } + + $compile(element.contents())(scope); + }; + + return { + restrict: "E", + require: "^ngModel", + scope: { + nodeDefinition:'=', + required:'=ngRequired', + readonly:'=ngReadonly' + }, + link: linker + }; + +} diff --git a/ui/src/app/rulechain/rulenode-config.tpl.html b/ui/src/app/rulechain/rulenode-config.tpl.html new file mode 100644 index 0000000000..32d5347b43 --- /dev/null +++ b/ui/src/app/rulechain/rulenode-config.tpl.html @@ -0,0 +1,32 @@ + + + + +
{{definedDirectiveError}}
+ + diff --git a/ui/src/app/rulechain/rulenode-defined-config.directive.js b/ui/src/app/rulechain/rulenode-defined-config.directive.js new file mode 100644 index 0000000000..5ec2620aaf --- /dev/null +++ b/ui/src/app/rulechain/rulenode-defined-config.directive.js @@ -0,0 +1,63 @@ +/* + * Copyright © 2016-2018 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. + */ + +const SNAKE_CASE_REGEXP = /[A-Z]/g; + +/*@ngInject*/ +export default function RuleNodeDefinedConfigDirective($compile) { + + var linker = function (scope, element, attrs, ngModelCtrl) { + + attrs.$observe('ruleNodeDirective', function() { + loadTemplate(); + }); + + scope.$watch('configuration', function (newVal, prevVal) { + if (!angular.equals(newVal, prevVal)) { + ngModelCtrl.$setViewValue(scope.configuration); + } + }); + + ngModelCtrl.$render = function () { + scope.configuration = ngModelCtrl.$viewValue; + }; + + function loadTemplate() { + var directive = snake_case(attrs.ruleNodeDirective, '-'); + var template = `<${directive} ng-model="configuration" ng-required="required" ng-readonly="readonly">`; + element.html(template); + $compile(element.contents())(scope); + } + + function snake_case(name, separator) { + separator = separator || '_'; + return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) { + return (pos ? separator : '') + letter.toLowerCase(); + }); + } + }; + + return { + restrict: "E", + require: "^ngModel", + scope: { + required:'=ngRequired', + readonly:'=ngReadonly' + }, + link: linker + }; + +} diff --git a/ui/src/app/rulechain/rulenode-fieldset.tpl.html b/ui/src/app/rulechain/rulenode-fieldset.tpl.html index 30cf0752cd..ad109ef6cb 100644 --- a/ui/src/app/rulechain/rulenode-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulenode-fieldset.tpl.html @@ -38,11 +38,16 @@ ng-model="ruleNode.debugMode">{{ 'rulenode.debug-mode' | translate }} - + + diff --git a/ui/src/app/rulechain/rulenode.scss b/ui/src/app/rulechain/rulenode.scss index febc637a37..0466673337 100644 --- a/ui/src/app/rulechain/rulenode.scss +++ b/ui/src/app/rulechain/rulenode.scss @@ -19,4 +19,10 @@ height: 300px; display: block; } +} + +.tb-rulenode-directive-error { + color: rgb(221,44,0); + font-size: 13px; + font-weight: 400; } \ No newline at end of file From 784de0836fca6c6ea95de8061dd4532623639332 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 29 Mar 2018 10:57:28 +0300 Subject: [PATCH 41/75] Filter nodes UI configuration. --- .../rule/engine/filter/TbJsFilterNode.java | 4 +- .../filter/TbJsFilterNodeConfiguration.java | 2 +- .../rule/engine/filter/TbJsSwitchNode.java | 27 ++-------- .../filter/TbJsSwitchNodeConfiguration.java | 8 +-- .../engine/filter/TbMsgTypeFilterNode.java | 4 +- .../TbMsgTypeFilterNodeConfiguration.java | 2 +- .../rule/engine/js/NashornJsEngine.java | 18 ++++--- .../engine/metadata/TbGetAttributesNode.java | 2 +- .../metadata/TbGetCustomerAttributeNode.java | 2 +- .../metadata/TbGetRelatedAttributeNode.java | 2 +- .../metadata/TbGetTenantAttributeNode.java | 2 +- .../engine/transform/TbTransformMsgNode.java | 4 +- .../TbTransformMsgNodeConfiguration.java | 2 +- .../static/rulenode/rulenode-core-config.css | 2 + .../static/rulenode/rulenode-core-config.js | 2 +- .../engine/filter/TbJsFilterNodeTest.java | 14 ++--- .../engine/filter/TbJsSwitchNodeTest.java | 52 ++++--------------- .../transform/TbTransformMsgNodeTest.java | 6 +-- ui/server.js | 1 - .../components/json-object-edit.directive.js | 23 ++++++-- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 6 +++ ui/src/app/rulechain/rulechain.tpl.html | 27 ++++++---- .../rulechain/rulenode-config.directive.js | 9 +++- .../rulenode-defined-config.directive.js | 6 ++- .../app/rulechain/rulenode-fieldset.tpl.html | 35 +++++-------- 26 files changed, 123 insertions(+), 140 deletions(-) create mode 100644 rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index c684b200c5..eb8941cc8c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -35,7 +35,7 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If True - send Message via True chain, otherwise False chain is used." + "Message payload can be accessed via msg property. For example msg.temperature < 10;" + - "Message metadata can be accessed via meta property. For example meta.customerName === 'John';", + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbFilterNodeScriptConfig") @@ -47,7 +47,7 @@ public class TbJsFilterNode implements TbNode { @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsFilterNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript()); + this.jsEngine = new NashornJsEngine(config.getJsScript(), "Filter"); } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java index 3b19c7c641..2d776ce3e3 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java @@ -26,7 +26,7 @@ public class TbJsFilterNodeConfiguration implements NodeConfiguration { @Override public TbJsFilterNodeConfiguration defaultConfiguration() { TbJsFilterNodeConfiguration configuration = new TbJsFilterNodeConfiguration(); - configuration.setJsScript("msg.passed < 15 && msg.name === 'Vit' && meta.temp == 10 && msg.bigObj.prop == 42;"); + configuration.setJsScript("return msg.passed < 15 && msg.name === 'Vit' && metadata.temp == 10 && msg.bigObj.prop == 42;"); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index c1236a4653..98f0ebcd76 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -36,7 +36,9 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + "If Array is empty - message not routed to next Node. " + "Message payload can be accessed via msg property. For example msg.temperature < 10; " + - "Message metadata can be accessed via meta property. For example meta.customerName === 'John';") + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';", + uiResources = {"static/rulenode/rulenode-core-config.js"}, + configDirective = "tbFilterNodeSwitchConfig") public class TbJsSwitchNode implements TbNode { private TbJsSwitchNodeConfiguration config; @@ -45,22 +47,11 @@ public class TbJsSwitchNode implements TbNode { @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsSwitchNodeConfiguration.class); - if (config.getAllowedRelations().size() < 1) { - String message = "Switch node should have at least 1 relation"; - log.error(message); - throw new IllegalStateException(message); - } - if (!config.isRouteToAllWithNoCheck()) { - this.jsEngine = new NashornJsEngine(config.getJsScript()); - } + this.jsEngine = new NashornJsEngine(config.getJsScript(), "Switch"); } @Override public void onMsg(TbContext ctx, TbMsg msg) { - if (config.isRouteToAllWithNoCheck()) { - ctx.tellNext(msg, config.getAllowedRelations()); - return; - } ListeningExecutor jsExecutor = ctx.getJsExecutor(); withCallback(jsExecutor.executeAsync(() -> jsEngine.executeSwitch(toBindings(msg))), result -> processSwitch(ctx, msg, result), @@ -68,15 +59,7 @@ public class TbJsSwitchNode implements TbNode { } private void processSwitch(TbContext ctx, TbMsg msg, Set nextRelations) { - if (validateRelations(nextRelations)) { - ctx.tellNext(msg, nextRelations); - } else { - ctx.tellError(msg, new IllegalStateException("Unsupported relation for switch " + nextRelations)); - } - } - - private boolean validateRelations(Set nextRelations) { - return config.getAllowedRelations().containsAll(nextRelations); + ctx.tellNext(msg, nextRelations); } private Bindings toBindings(TbMsg msg) { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java index b354c7199f..3a4856cd93 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -25,19 +25,15 @@ import java.util.Set; public class TbJsSwitchNodeConfiguration implements NodeConfiguration { private String jsScript; - private Set allowedRelations; - private boolean routeToAllWithNoCheck; @Override public TbJsSwitchNodeConfiguration defaultConfiguration() { TbJsSwitchNodeConfiguration configuration = new TbJsSwitchNodeConfiguration(); - configuration.setJsScript("function nextRelation(meta, msg) {\n" + + configuration.setJsScript("function nextRelation(metadata, msg) {\n" + " return ['one','nine'];" + "};\n" + "\n" + - "nextRelation(meta, msg);"); - configuration.setAllowedRelations(Sets.newHashSet("one", "two")); - configuration.setRouteToAllWithNoCheck(false); + "return nextRelation(metadata, msg);"); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index 3a86c25afb..8d72a7b711 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -31,7 +31,9 @@ import org.thingsboard.server.common.msg.TbMsg; configClazz = TbMsgTypeFilterNodeConfiguration.class, nodeDescription = "Filter incoming messages by Message Type", nodeDetails = "Evaluate incoming Message with configured JS condition. " + - "If incoming MessageType is expected - send Message via Success chain, otherwise Failure chain is used.") + "If incoming MessageType is expected - send Message via Success chain, otherwise Failure chain is used.", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbFilterNodeMessageTypeConfig") public class TbMsgTypeFilterNode implements TbNode { TbMsgTypeFilterNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java index a2e1b179f0..aafd2ed7c2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java @@ -33,7 +33,7 @@ public class TbMsgTypeFilterNodeConfiguration implements NodeConfiguration { @Override public TbMsgTypeFilterNodeConfiguration defaultConfiguration() { TbMsgTypeFilterNodeConfiguration configuration = new TbMsgTypeFilterNodeConfiguration(); - configuration.setMessageTypes(Arrays.asList("GET_ATTRIBUTES","POST_ATTRIBUTES","POST_TELEMETRY","RPC_REQUEST")); + configuration.setMessageTypes(Arrays.asList("POST_ATTRIBUTES","POST_TELEMETRY","RPC_REQUEST")); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java index 082535f0fe..a4add405e7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -34,14 +34,20 @@ import java.util.Set; @Slf4j public class NashornJsEngine { - public static final String METADATA = "meta"; + public static final String METADATA = "metadata"; public static final String DATA = "msg"; + + private static final String JS_WRAPPER_PREFIX_TEMPLATE = "function %s(msg, metadata) { "; + private static final String JS_WRAPPER_SUFFIX_TEMPLATE = "}\n %s(msg, metadata);"; + private static NashornScriptEngineFactory factory = new NashornScriptEngineFactory(); private CompiledScript engine; - public NashornJsEngine(String script) { - engine = compileScript(script); + public NashornJsEngine(String script, String functionName) { + String jsWrapperPrefix = String.format(JS_WRAPPER_PREFIX_TEMPLATE, functionName); + String jsWrapperSuffix = String.format(JS_WRAPPER_SUFFIX_TEMPLATE, functionName); + engine = compileScript(jsWrapperPrefix + script + jsWrapperSuffix); } private static CompiledScript compileScript(String script) { @@ -58,15 +64,15 @@ public class NashornJsEngine { public static Bindings bindMsg(TbMsg msg) { try { Bindings bindings = new SimpleBindings(); - bindings.put(METADATA, msg.getMetaData().getData()); - if (ArrayUtils.isNotEmpty(msg.getData())) { ObjectMapper mapper = new ObjectMapper(); JsonNode jsonNode = mapper.readTree(msg.getData()); Map map = mapper.treeToValue(jsonNode, Map.class); bindings.put(DATA, map); + } else { + bindings.put(DATA, Collections.emptyMap()); } - + bindings.put(METADATA, msg.getMetaData().getData()); return bindings; } catch (Throwable th) { throw new IllegalArgumentException("Cannot bind js args", th); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 69ee9d7c79..4fc0f3e48f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -42,7 +42,7 @@ import static org.thingsboard.server.common.data.DataConstants.*; nodeDescription = "Add Message Originator Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + - "meta.cs.temperature or meta.shared.limit " + + "metadata.cs.temperature or metadata.shared.limit " + "If Latest Telemetry enrichment configured, latest telemetry added into metadata without prefix.") public class TbGetAttributesNode implements TbNode { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index cc6d6a1197..c59a65e27d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 22c0b9f0a8..4cd5cd5ba6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; "If multiple Related Entities are found, only first Entity is used for attributes enrichment, other entities are discarded. " + "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index b5f5e02dbe..3165385587 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType; nodeDescription = "Add Originators Tenant Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "meta.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index 626790fcf8..e47ea0f8db 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -30,7 +30,7 @@ import javax.script.Bindings; configClazz = TbTransformMsgNodeConfiguration.class, nodeDescription = "Change Message payload and Metadata using JavaScript", nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside.
" + - "meta - is a Message metadata.
" + + "metadata - is a Message metadata.
" + "msg - is a Message payload.
Any properties can be changed/removed/added in those objects.") public class TbTransformMsgNode extends TbAbstractTransformNode { @@ -40,7 +40,7 @@ public class TbTransformMsgNode extends TbAbstractTransformNode { @Override public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript()); + this.jsEngine = new NashornJsEngine(config.getJsScript(), "Transform"); setConfig(config); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java index 4f9e9eb681..09d5ac43ad 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java @@ -27,7 +27,7 @@ public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguratio public TbTransformMsgNodeConfiguration defaultConfiguration() { TbTransformMsgNodeConfiguration configuration = new TbTransformMsgNodeConfiguration(); configuration.setStartNewChain(false); - configuration.setJsScript("msg.passed = msg.passed * meta.temp; msg.bigObj.newProp = 'Ukraine' "); + configuration.setJsScript("return msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine' "); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css new file mode 100644 index 0000000000..a6103c1d56 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css @@ -0,0 +1,2 @@ +.tb-message-type-autocomplete .tb-not-found{display:block;line-height:1.5;height:48px}.tb-message-type-autocomplete .tb-not-found .tb-no-entries{line-height:48px}.tb-message-type-autocomplete li{height:auto!important;white-space:normal!important} +/*# sourceMappingURL=rulenode-core-config.css.map*/ \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index f254cf599d..3fe859d90f 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(r){if(n[r])return n[r].exports;var u=n[r]={exports:{},id:r,loaded:!1};return e[r].call(u.exports,u,u.exports,t),u.loaded=!0,u.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}([function(e,t,n){e.exports=n(3)},function(e,t){e.exports='
'},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function u(e){var t=function(t,n,r,u){var o=i.default;n.html(o),t.$watch("configuration",function(e,n){angular.equals(e,n)||u.$setViewValue(t.configuration)}),u.$render=function(){t.configuration=u.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}u.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=u;var o=n(1),i=r(o)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var u=n(2),o=r(u),i=n(5),a=r(i);t.default=angular.module("thingsboard.ruleChain.config",[]).directive("tbFilterNodeScriptConfig",o.default).config(a.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function u(e,t){(0,i.default)(t);for(var n in t){var r=t[n];e.translations(n,r)}}u.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=u;var o=n(4),i=r(o)}]); +!function(e){function t(s){if(a[s])return a[s].exports;var n=a[s]={exports:{},id:s,loaded:!1};return e[s].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var a={};return t.m=e,t.c=a,t.p="/static/",t(0)}([function(e,t,a){e.exports=a(8)},function(e,t){},function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t,a){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function n(e,t,a){var s=function(s,n,r,l){function u(){if(l.$viewValue){for(var e=[],t=0;t 15;"); + initWithScript("return 10 > 15;"); TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}".getBytes()); mockJsExecutor(); @@ -64,7 +64,7 @@ public class TbJsFilterNodeTest { @Test public void notValidMsgDataThrowsException() throws TbNodeException { - initWithScript("10 > 15;"); + initWithScript("return 10 > 15;"); TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), new byte[4]); when(ctx.getJsExecutor()).thenReturn(executor); @@ -77,7 +77,7 @@ public class TbJsFilterNodeTest { @Test public void exceptionInJsThrowsException() throws TbNodeException { - initWithScript("meta.temp.curr < 15;"); + initWithScript("return metadata.temp.curr < 15;"); TbMsgMetaData metaData = new TbMsgMetaData(); TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); mockJsExecutor(); @@ -89,12 +89,12 @@ public class TbJsFilterNodeTest { @Test(expected = IllegalArgumentException.class) public void notValidScriptThrowsException() throws TbNodeException { - initWithScript("10 > 15 asdq out"); + initWithScript("return 10 > 15 asdq out"); } @Test public void metadataConditionCanBeFalse() throws TbNodeException { - initWithScript("meta.humidity < 15;"); + initWithScript("return metadata.humidity < 15;"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -109,7 +109,7 @@ public class TbJsFilterNodeTest { @Test public void metadataConditionCanBeTrue() throws TbNodeException { - initWithScript("meta.temp < 15;"); + initWithScript("return metadata.temp < 15;"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -123,7 +123,7 @@ public class TbJsFilterNodeTest { @Test public void msgJsonParsedAndBinded() throws TbNodeException { - initWithScript("msg.passed < 15 && msg.name === 'Vit' && meta.temp == 10 && msg.bigObj.prop == 42;"); + initWithScript("return msg.passed < 15 && msg.name === 'Vit' && metadata.temp == 10 && msg.bigObj.prop == 42;"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index e70d4e16f4..01227f48aa 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -52,28 +52,17 @@ public class TbJsSwitchNodeTest { @Mock private ListeningExecutor executor; - @Test - public void routeToAllDoNotEvaluatesJs() throws TbNodeException { - HashSet relations = Sets.newHashSet("one", "two"); - initWithScript("test qwerty", relations, true); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}".getBytes()); - - node.onMsg(ctx, msg); - verify(ctx).tellNext(msg, relations); - verifyNoMoreInteractions(ctx, executor); - } - @Test public void multipleRoutesAreAllowed() throws TbNodeException { - String jsCode = "function nextRelation(meta, msg) {\n" + - " if(msg.passed == 5 && meta.temp == 10)\n" + + String jsCode = "function nextRelation(metadata, msg) {\n" + + " if(msg.passed == 5 && metadata.temp == 10)\n" + " return ['three', 'one']\n" + " else\n" + " return 'two';\n" + "};\n" + "\n" + - "nextRelation(meta, msg);"; - initWithScript(jsCode, Sets.newHashSet("one", "two", "three"), false); + "return nextRelation(metadata, msg);"; + initWithScript(jsCode); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -89,15 +78,15 @@ public class TbJsSwitchNodeTest { @Test public void allowedRelationPassed() throws TbNodeException { - String jsCode = "function nextRelation(meta, msg) {\n" + - " if(msg.passed == 5 && meta.temp == 10)\n" + + String jsCode = "function nextRelation(metadata, msg) {\n" + + " if(msg.passed == 5 && metadata.temp == 10)\n" + " return 'one'\n" + " else\n" + " return 'two';\n" + "};\n" + "\n" + - "nextRelation(meta, msg);"; - initWithScript(jsCode, Sets.newHashSet("one", "two"), false); + "return nextRelation(metadata, msg);"; + initWithScript(jsCode); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); @@ -111,32 +100,9 @@ public class TbJsSwitchNodeTest { verify(ctx).tellNext(msg, Sets.newHashSet("one")); } - @Test - public void unknownRelationThrowsException() throws TbNodeException { - String jsCode = "function nextRelation(meta, msg) {\n" + - " return ['one','nine'];" + - "};\n" + - "\n" + - "nextRelation(meta, msg);"; - initWithScript(jsCode, Sets.newHashSet("one", "two"), false); - TbMsgMetaData metaData = new TbMsgMetaData(); - metaData.putValue("temp", "10"); - metaData.putValue("humidity", "99"); - String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; - - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); - mockJsExecutor(); - - node.onMsg(ctx, msg); - verify(ctx).getJsExecutor(); - verifyError(msg, "Unsupported relation for switch [nine, one]", IllegalStateException.class); - } - - private void initWithScript(String script, Set relations, boolean routeToAll) throws TbNodeException { + private void initWithScript(String script) throws TbNodeException { TbJsSwitchNodeConfiguration config = new TbJsSwitchNodeConfiguration(); config.setJsScript(script); - config.setAllowedRelations(relations); - config.setRouteToAllWithNoCheck(routeToAll); ObjectMapper mapper = new ObjectMapper(); TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java index d69bad8864..c6b3441f27 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -51,7 +51,7 @@ public class TbTransformMsgNodeTest { @Test public void metadataCanBeUpdated() throws TbNodeException { - initWithScript("meta.temp = meta.temp * 10;"); + initWithScript("return metadata.temp = metadata.temp * 10;"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); @@ -70,7 +70,7 @@ public class TbTransformMsgNodeTest { @Test public void metadataCanBeAdded() throws TbNodeException { - initWithScript("meta.newAttr = meta.humidity - msg.passed;"); + initWithScript("return metadata.newAttr = metadata.humidity - msg.passed;"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); @@ -89,7 +89,7 @@ public class TbTransformMsgNodeTest { @Test public void payloadCanBeUpdated() throws TbNodeException { - initWithScript("msg.passed = msg.passed * meta.temp; msg.bigObj.newProp = 'Ukraine' "); + initWithScript("return msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine' "); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); diff --git a/ui/server.js b/ui/server.js index 0513600afd..65a2bc7f45 100644 --- a/ui/server.js +++ b/ui/server.js @@ -32,7 +32,6 @@ const forwardPort = 8080; const ruleNodeUiforwardHost = 'localhost'; const ruleNodeUiforwardPort = 8080; -//const ruleNodeUiforwardPort = 5000; const app = express(); const server = http.createServer(app); diff --git a/ui/src/app/components/json-object-edit.directive.js b/ui/src/app/components/json-object-edit.directive.js index db0aa60bb5..215b7b9fe8 100644 --- a/ui/src/app/components/json-object-edit.directive.js +++ b/ui/src/app/components/json-object-edit.directive.js @@ -84,17 +84,32 @@ function JsonObjectEdit($compile, $templateCache, $document, toast, utils) { scope.$watch('contentBody', function (newVal, prevVal) { if (!angular.equals(newVal, prevVal)) { var object = scope.validate(); - ngModelCtrl.$setViewValue(object); + if (scope.objectValid) { + if (object == null) { + scope.object = null; + } else { + if (scope.object == null) { + scope.object = {}; + } + Object.keys(scope.object).forEach(function (key) { + delete scope.object[key]; + }); + Object.keys(object).forEach(function (key) { + scope.object[key] = object[key]; + }); + } + ngModelCtrl.$setViewValue(scope.object); + } scope.updateValidity(); } }); ngModelCtrl.$render = function () { - var object = ngModelCtrl.$viewValue; + scope.object = ngModelCtrl.$viewValue; var content = ''; try { - if (object) { - content = angular.toJson(object, true); + if (scope.object) { + content = angular.toJson(scope.object, true); } } catch (e) { // diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index b511b56c33..a70ca14c5f 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1171,6 +1171,7 @@ export default angular.module('thingsboard.locale', []) "debug-mode": "Debug mode" }, "rulenode": { + "details": "Details", "add": "Add rule node", "name": "Name", "name-required": "Name is required.", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index dd48bb007a..fbdda227fb 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -256,6 +256,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.isEditingRuleNodeLink = true; vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); vm.editingRuleNodeLink = angular.copy(edge); + $mdUtil.nextTick(() => { + vm.ruleNodeLinkForm.$setPristine(); + }); } }, nodeCallbacks: { @@ -266,6 +269,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.isEditingRuleNode = true; vm.editingRuleNodeIndex = vm.ruleChainModel.nodes.indexOf(node); vm.editingRuleNode = angular.copy(node); + $mdUtil.nextTick(() => { + vm.ruleNodeForm.$setPristine(); + }); } } }, diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index d23f920e0f..3083f83835 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -65,7 +65,8 @@
-
- - -
+ + +
+ + +
+ + { + if (scope.nodeDefinition) { + validateDefinedDirective(); + } + }); function validateDefinedDirective() { if (scope.nodeDefinition.uiResourceLoadError && scope.nodeDefinition.uiResourceLoadError.length) { diff --git a/ui/src/app/rulechain/rulenode-defined-config.directive.js b/ui/src/app/rulechain/rulenode-defined-config.directive.js index 5ec2620aaf..5100fbb96b 100644 --- a/ui/src/app/rulechain/rulenode-defined-config.directive.js +++ b/ui/src/app/rulechain/rulenode-defined-config.directive.js @@ -36,10 +36,14 @@ export default function RuleNodeDefinedConfigDirective($compile) { }; function loadTemplate() { + if (scope.ruleNodeConfigScope) { + scope.ruleNodeConfigScope.$destroy(); + } var directive = snake_case(attrs.ruleNodeDirective, '-'); var template = `<${directive} ng-model="configuration" ng-required="required" ng-readonly="readonly">`; element.html(template); - $compile(element.contents())(scope); + scope.ruleNodeConfigScope = scope.$new(); + $compile(element.contents())(scope.ruleNodeConfigScope); } function snake_case(name, separator) { diff --git a/ui/src/app/rulechain/rulenode-fieldset.tpl.html b/ui/src/app/rulechain/rulenode-fieldset.tpl.html index ad109ef6cb..7b0fae5a5f 100644 --- a/ui/src/app/rulechain/rulenode-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulenode-fieldset.tpl.html @@ -21,33 +21,26 @@
- - - -
- - - -
-
rulenode.name-required
-
- - - {{ 'rulenode.debug-mode' | translate }} - - +
+ + + +
+
rulenode.name-required
+
+ + + {{ 'rulenode.debug-mode' | translate }} + + +
- From 4bbcffdf637f7fca0aa2caa03c514f31a3872561 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 29 Mar 2018 20:25:47 +0300 Subject: [PATCH 42/75] Rule Node Debug UI --- .../server/actors/ActorSystemContext.java | 71 +++++++++++-------- .../AbstractRuleEngineControllerTest.java | 2 +- .../server/common/data/DataConstants.java | 2 +- ui/src/app/common/types.constant.js | 30 +++++++- .../components/details-sidenav.directive.js | 19 ++++- .../app/components/details-sidenav.tpl.html | 1 + .../event/event-content-dialog.controller.js | 17 ++++- .../event-header-debug-rulenode.tpl.html | 27 +++++++ ui/src/app/event/event-header.directive.js | 7 ++ .../event/event-row-debug-rulenode.tpl.html | 63 ++++++++++++++++ ui/src/app/event/event-row.directive.js | 16 ++++- ui/src/app/event/event-table.directive.js | 18 ++++- ui/src/app/locale/locale.constant.js | 15 ++++ ui/src/app/rulechain/rulechain.controller.js | 15 ++-- ui/src/app/rulechain/rulechain.tpl.html | 18 ++++- ui/src/app/rulechain/rulechains.tpl.html | 3 +- 16 files changed, 276 insertions(+), 48 deletions(-) create mode 100644 ui/src/app/event/event-header-debug-rulenode.tpl.html create mode 100644 ui/src/app/event/event-row-debug-rulenode.tpl.html diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index a5a20b83fa..9e02946574 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -25,6 +25,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -38,6 +39,7 @@ 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.TbMsg; +import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.transport.auth.DeviceAuthService; import org.thingsboard.server.controller.plugin.PluginWebSocketMsgEndpoint; @@ -60,11 +62,13 @@ import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import org.thingsboard.server.service.component.ComponentDiscoveryService; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Optional; +@Slf4j @Component public class ActorSystemContext { private static final String AKKA_CONF_FILE_NAME = "actor-system.conf"; @@ -292,38 +296,49 @@ public class ActorSystemContext { } private void persistDebug(TenantId tenantId, EntityId entityId, String type, TbMsg tbMsg, Throwable error) { - Event event = new Event(); - event.setTenantId(tenantId); - event.setEntityId(entityId); - event.setType(DataConstants.DEBUG); - - ObjectNode node = mapper.createObjectNode() - .put("type", type) - .put("server", getServerAddress()) - .put("entityId", tbMsg.getOriginator().getId().toString()) - .put("entityName", tbMsg.getOriginator().getEntityType().name()) - .put("msgId", tbMsg.getId().toString()) - .put("msgType", tbMsg.getType()) - .put("dataType", tbMsg.getDataType().name()); - - ObjectNode mdNode = node.putObject("metadata"); - tbMsg.getMetaData().getData().forEach(mdNode::put); + try { + Event event = new Event(); + event.setTenantId(tenantId); + event.setEntityId(entityId); + event.setType(DataConstants.DEBUG_RULE_NODE); + + String metadata = mapper.writeValueAsString(tbMsg.getMetaData().getData()); + + ObjectNode node = mapper.createObjectNode() + .put("type", type) + .put("server", getServerAddress()) + .put("entityId", tbMsg.getOriginator().getId().toString()) + .put("entityName", tbMsg.getOriginator().getEntityType().name()) + .put("msgId", tbMsg.getId().toString()) + .put("msgType", tbMsg.getType()) + .put("dataType", tbMsg.getDataType().name()) + .put("data", convertToString(tbMsg.getDataType(), tbMsg.getData())) + .put("metadata", metadata); + + if (error != null) { + node = node.put("error", toString(error)); + } + + event.setBody(node); + eventService.save(event); + } catch (IOException ex) { + log.warn("Failed to persist rule node debug message", ex); + } + } - switch (tbMsg.getDataType()) { + private String convertToString(TbMsgDataType messageType, byte[] data) { + if (data == null) { + return null; + } + switch (messageType) { + case JSON: + case TEXT: + return new String(data, StandardCharsets.UTF_8); case BINARY: - node.put("data", Base64Utils.encodeUrlSafe(tbMsg.getData())); - break; + return Base64Utils.encodeToString(data); default: - node.put("data", new String(tbMsg.getData(), StandardCharsets.UTF_8)); - break; - } - - if (error != null) { - node = node.put("error", toString(error)); + throw new RuntimeException("Message type: " + messageType + " is not supported!"); } - - event.setBody(node); - eventService.save(event); } public static Exception toException(Throwable error) { diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java index bbcb98ff48..93fe76752e 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java @@ -51,6 +51,6 @@ public class AbstractRuleEngineControllerTest extends AbstractControllerTest { TimePageLink pageLink = new TimePageLink(limit); return doGetTypedWithTimePageLink("/api/events/{entityType}/{entityId}/{eventType}?tenantId={tenantId}&", new TypeReference>() { - }, pageLink, entityId.getEntityType(), entityId.getId(), DataConstants.DEBUG, tenantId.getId()); + }, pageLink, entityId.getEntityType(), entityId.getId(), DataConstants.DEBUG_RULE_NODE, tenantId.getId()); } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java index 659a242882..7d4e4807c9 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java @@ -37,7 +37,7 @@ public class DataConstants { public static final String ERROR = "ERROR"; public static final String LC_EVENT = "LC_EVENT"; public static final String STATS = "STATS"; - public static final String DEBUG = "DEBUG"; + public static final String DEBUG_RULE_NODE = "DEBUG_RULE_NODE"; public static final String ONEWAY = "ONEWAY"; public static final String TWOWAY = "TWOWAY"; diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 8026115b35..21865087cc 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -279,6 +279,23 @@ export default angular.module('thingsboard.types', []) function: "function", alarm: "alarm" }, + contentType: { + "JSON": { + value: "JSON", + name: "content-type.json", + code: "json" + }, + "TEXT": { + value: "TEXT", + name: "content-type.text", + code: "text" + }, + "BINARY": { + value: "BINARY", + name: "content-type.binary", + code: "text" + } + }, componentType: { filter: "FILTER", processor: "PROCESSOR", @@ -295,7 +312,8 @@ export default angular.module('thingsboard.types', []) user: "USER", dashboard: "DASHBOARD", alarm: "ALARM", - rulechain: "RULE_CHAIN" + rulechain: "RULE_CHAIN", + rulenode: "RULE_NODE" }, aliasEntityType: { current_customer: "CURRENT_CUSTOMER" @@ -388,6 +406,16 @@ export default angular.module('thingsboard.types', []) name: "event.type-stats" } }, + debugEventType: { + debugRuleNode: { + value: "DEBUG_RULE_NODE", + name: "event.type-debug-rule-node" + }, + debugRuleChain: { + value: "DEBUG_RULE_CHAIN", + name: "event.type-debug-rule-chain" + } + }, extensionType: { http: "HTTP", mqtt: "MQTT", diff --git a/ui/src/app/components/details-sidenav.directive.js b/ui/src/app/components/details-sidenav.directive.js index e455a80dcd..a25374b099 100644 --- a/ui/src/app/components/details-sidenav.directive.js +++ b/ui/src/app/components/details-sidenav.directive.js @@ -26,7 +26,7 @@ export default angular.module('thingsboard.directives.detailsSidenav', []) .name; /*@ngInject*/ -function DetailsSidenav($timeout) { +function DetailsSidenav($timeout, $window) { var linker = function (scope, element, attrs) { @@ -42,6 +42,23 @@ function DetailsSidenav($timeout) { scope.isEdit = true; } + if (angular.isDefined(attrs.closeOnClickOutside && attrs.closeOnClickOutside)) { + scope.closeOnClickOutside = true; + var clickOutsideHandler = function() { + scope.closeDetails(); + }; + angular.element($window).click(clickOutsideHandler); + scope.$on("$destroy", function () { + angular.element($window).unbind('click', clickOutsideHandler); + }); + } + + scope.onClick = function($event) { + if (scope.closeOnClickOutside) { + $event.stopPropagation(); + } + }; + scope.toggleDetailsEditMode = function () { if (!scope.isAlwaysEdit) { if (!scope.isEdit) { diff --git a/ui/src/app/components/details-sidenav.tpl.html b/ui/src/app/components/details-sidenav.tpl.html index c504a24a79..a0032ff435 100644 --- a/ui/src/app/components/details-sidenav.tpl.html +++ b/ui/src/app/components/details-sidenav.tpl.html @@ -19,6 +19,7 @@ md-disable-backdrop="true" md-is-open="isOpen" md-component-id="right" + ng-click="onClick($event)" layout="column">
diff --git a/ui/src/app/event/event-content-dialog.controller.js b/ui/src/app/event/event-content-dialog.controller.js index 108f95e323..8d13f9654a 100644 --- a/ui/src/app/event/event-content-dialog.controller.js +++ b/ui/src/app/event/event-content-dialog.controller.js @@ -17,11 +17,14 @@ import $ from 'jquery'; import 'brace/ext/language_tools'; import 'brace/mode/java'; import 'brace/theme/github'; +import beautify from 'js-beautify'; /* eslint-disable angular/angularelement */ +const js_beautify = beautify.js; + /*@ngInject*/ -export default function EventContentDialogController($mdDialog, content, title, showingCallback) { +export default function EventContentDialogController($mdDialog, types, content, contentType, title, showingCallback) { var vm = this; @@ -32,9 +35,19 @@ export default function EventContentDialogController($mdDialog, content, title, vm.content = content; vm.title = title; + var mode; + if (contentType) { + mode = types.contentType[contentType].code; + if (contentType == types.contentType.JSON.value && vm.content) { + vm.content = js_beautify(vm.content, {indent_size: 4}); + } + } else { + mode = 'java'; + } + vm.contentOptions = { useWrapMode: false, - mode: 'java', + mode: mode, showGutter: false, showPrintMargin: false, theme: 'github', diff --git a/ui/src/app/event/event-header-debug-rulenode.tpl.html b/ui/src/app/event/event-header-debug-rulenode.tpl.html new file mode 100644 index 0000000000..b412a0c50a --- /dev/null +++ b/ui/src/app/event/event-header-debug-rulenode.tpl.html @@ -0,0 +1,27 @@ + +
event.event-time
+
event.server
+
event.type
+
event.entity
+
event.message-id
+
event.message-type
+
event.data-type
+
event.data
+
event.metadata
+
event.error
diff --git a/ui/src/app/event/event-header.directive.js b/ui/src/app/event/event-header.directive.js index afac804f30..bc4cdbe9ea 100644 --- a/ui/src/app/event/event-header.directive.js +++ b/ui/src/app/event/event-header.directive.js @@ -18,6 +18,7 @@ import eventHeaderLcEventTemplate from './event-header-lc-event.tpl.html'; import eventHeaderStatsTemplate from './event-header-stats.tpl.html'; import eventHeaderErrorTemplate from './event-header-error.tpl.html'; +import eventHeaderDebugRuleNodeTemplate from './event-header-debug-rulenode.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ @@ -38,6 +39,12 @@ export default function EventHeaderDirective($compile, $templateCache, types) { case types.eventType.error.value: template = eventHeaderErrorTemplate; break; + case types.debugEventType.debugRuleNode.value: + template = eventHeaderDebugRuleNodeTemplate; + break; + case types.debugEventType.debugRuleChain.value: + template = eventHeaderDebugRuleNodeTemplate; + break; } return $templateCache.get(template); } diff --git a/ui/src/app/event/event-row-debug-rulenode.tpl.html b/ui/src/app/event/event-row-debug-rulenode.tpl.html new file mode 100644 index 0000000000..ec00b39ef1 --- /dev/null +++ b/ui/src/app/event/event-row-debug-rulenode.tpl.html @@ -0,0 +1,63 @@ + +
{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}
+
{{event.body.server}}
+
{{event.body.type}}
+
{{event.body.entityName}}
+
{{event.body.msgId}}
+
{{event.body.msgType}}
+
{{event.body.dataType}}
+
+ + + {{ 'action.view' | translate }} + + + more_horiz + + +
+
+ + + {{ 'action.view' | translate }} + + + more_horiz + + +
+
+ + + {{ 'action.view' | translate }} + + + more_horiz + + +
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js index f005542d40..4643761b39 100644 --- a/ui/src/app/event/event-row.directive.js +++ b/ui/src/app/event/event-row.directive.js @@ -20,6 +20,7 @@ import eventErrorDialogTemplate from './event-content-dialog.tpl.html'; import eventRowLcEventTemplate from './event-row-lc-event.tpl.html'; import eventRowStatsTemplate from './event-row-stats.tpl.html'; import eventRowErrorTemplate from './event-row-error.tpl.html'; +import eventRowDebugRuleNodeTemplate from './event-row-debug-rulenode.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ @@ -40,6 +41,12 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ case types.eventType.error.value: template = eventRowErrorTemplate; break; + case types.debugEventType.debugRuleNode.value: + template = eventRowDebugRuleNodeTemplate; + break; + case types.debugEventType.debugRuleChain.value: + template = eventRowDebugRuleNodeTemplate; + break; } return $templateCache.get(template); } @@ -53,17 +60,22 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ scope.loadTemplate(); }); + scope.types = types; + scope.event = attrs.event; - scope.showContent = function($event, content, title) { + scope.showContent = function($event, content, title, contentType) { var onShowingCallback = { onShowing: function(){} } + if (!contentType) { + contentType = null; + } $mdDialog.show({ controller: 'EventContentDialogController', controllerAs: 'vm', templateUrl: eventErrorDialogTemplate, - locals: {content: content, title: title, showingCallback: onShowingCallback}, + locals: {content: content, title: title, contentType: contentType, showingCallback: onShowingCallback}, parent: angular.element($document[0].body), fullscreen: true, targetEvent: $event, diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js index 4291014340..c61078dfe6 100644 --- a/ui/src/app/event/event-table.directive.js +++ b/ui/src/app/event/event-table.directive.js @@ -36,8 +36,8 @@ export default function EventTableDirective($compile, $templateCache, $rootScope for (var type in types.eventType) { var eventType = types.eventType[type]; var enabled = true; - for (var disabledType in disabledEventTypes) { - if (eventType.value === disabledEventTypes[disabledType]) { + for (var i=0;i
- + -
+
+ + + + + debug-event-types="{{vm.types.debugEventType.debugRuleChain.value}}" + default-event-type="{{vm.types.debugEventType.debugRuleChain.value}}"> From 3bcd596ed7fc33c6f71432408a61a08553f82318 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 30 Mar 2018 11:10:06 +0300 Subject: [PATCH 43/75] Details sidenav backdrop support --- .../components/details-sidenav.directive.js | 66 +++++++++++++++---- .../app/components/details-sidenav.tpl.html | 3 +- ui/src/app/rulechain/rulechain.tpl.html | 4 +- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/ui/src/app/components/details-sidenav.directive.js b/ui/src/app/components/details-sidenav.directive.js index a25374b099..2516134d6f 100644 --- a/ui/src/app/components/details-sidenav.directive.js +++ b/ui/src/app/components/details-sidenav.directive.js @@ -26,7 +26,7 @@ export default angular.module('thingsboard.directives.detailsSidenav', []) .name; /*@ngInject*/ -function DetailsSidenav($timeout, $window) { +function DetailsSidenav($timeout, $mdUtil, $q, $animate) { var linker = function (scope, element, attrs) { @@ -42,22 +42,62 @@ function DetailsSidenav($timeout, $window) { scope.isEdit = true; } - if (angular.isDefined(attrs.closeOnClickOutside && attrs.closeOnClickOutside)) { - scope.closeOnClickOutside = true; - var clickOutsideHandler = function() { - scope.closeDetails(); - }; - angular.element($window).click(clickOutsideHandler); - scope.$on("$destroy", function () { - angular.element($window).unbind('click', clickOutsideHandler); + var backdrop; + var previousContainerStyles; + + if (attrs.hasOwnProperty('tbEnableBackdrop')) { + backdrop = $mdUtil.createBackdrop(scope, "md-sidenav-backdrop md-opaque ng-enter"); + element.on('$destroy', function() { + backdrop && backdrop.remove(); + }); + scope.$on('$destroy', function(){ + backdrop && backdrop.remove(); + }); + scope.$watch('isOpen', updateIsOpen); + } + + function updateIsOpen(isOpen) { + backdrop[isOpen ? 'on' : 'off']('click', (ev)=>{ + ev.preventDefault(); + scope.isOpen = false; + scope.$apply(); + }); + var parent = element.parent(); + var restorePositioning = updateContainerPositions(parent, isOpen); + + return $q.all([ + isOpen && backdrop ? $animate.enter(backdrop, parent) : backdrop ? + $animate.leave(backdrop) : $q.when(true) + ]).then(function() { + restorePositioning && restorePositioning(); }); } - scope.onClick = function($event) { - if (scope.closeOnClickOutside) { - $event.stopPropagation(); + function updateContainerPositions(parent, willOpen) { + var drawerEl = element[0]; + var scrollTop = parent[0].scrollTop; + if (willOpen && scrollTop) { + previousContainerStyles = { + top: drawerEl.style.top, + bottom: drawerEl.style.bottom, + height: drawerEl.style.height + }; + var positionStyle = { + top: scrollTop + 'px', + bottom: 'auto', + height: parent[0].clientHeight + 'px' + }; + backdrop.css(positionStyle); } - }; + if (!willOpen && previousContainerStyles) { + return function() { + backdrop[0].style.top = null; + backdrop[0].style.bottom = null; + backdrop[0].style.height = null; + previousContainerStyles = null; + }; + } + } scope.toggleDetailsEditMode = function () { if (!scope.isAlwaysEdit) { diff --git a/ui/src/app/components/details-sidenav.tpl.html b/ui/src/app/components/details-sidenav.tpl.html index a0032ff435..763bc2295a 100644 --- a/ui/src/app/components/details-sidenav.tpl.html +++ b/ui/src/app/components/details-sidenav.tpl.html @@ -16,10 +16,9 @@ -->
diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 0d557719cc..b25447e175 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -69,7 +69,7 @@ + ' - ' + vm.editingRuleNode.component.name}}" is-read-only="vm.selectedRuleNodeTabIndex > 0" is-open="vm.isEditingRuleNode" - close-on-click-outside="true" + tb-enable-backdrop is-always-edit="true" on-close-details="vm.onEditRuleNodeClosed()" on-toggle-details-edit-mode="vm.onRevertRuleNodeEdit(vm.ruleNodeForm)" @@ -108,7 +108,7 @@ header-subtitle="{{'rulenode.link-details' | translate}}" is-read-only="false" is-open="vm.isEditingRuleNodeLink" - close-on-click-outside="true" + tb-enable-backdrop is-always-edit="true" on-close-details="vm.onEditRuleNodeLinkClosed()" on-toggle-details-edit-mode="vm.onRevertRuleNodeLinkEdit(vm.ruleNodeLinkForm)" From 6823b8969f478ef6628ef7841add7b57aee147a4 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 30 Mar 2018 15:44:54 +0300 Subject: [PATCH 44/75] Refactoring of Telemetry Websockets --- .../server/config/WebSocketConfiguration.java | 8 +- .../controller/TelemetryController.java | 556 +++++++++++------- .../server/controller/ValidationCallback.java | 8 +- .../plugin/PluginApiController.java | 110 ++-- ...etHandler.java => TbWebSocketHandler.java} | 139 ++--- .../service/security/AccessValidator.java | 262 +++++++++ .../DefaultTelemetrySubscriptionService.java | 42 ++ .../DefaultTelemetryWebSocketService.java | 261 ++++++++ .../TelemetrySubscriptionService.java | 24 + .../TelemetryWebSocketMsgEndpoint.java | 14 + .../telemetry/TelemetryWebSocketService.java | 13 + .../TelemetryWebSocketSessionRef.java | 53 ++ .../telemetry/TelemetryWebSocketTextMsg.java | 19 + .../service/telemetry/WsSessionMetaData.java | 38 ++ .../common/data/id/EntityIdFactory.java | 4 + .../plugin/telemetry/SubscriptionManager.java | 4 +- .../handlers/TelemetryRpcMsgHandler.java | 16 +- 17 files changed, 1209 insertions(+), 362 deletions(-) rename application/src/main/java/org/thingsboard/server/controller/plugin/{PluginWebSocketHandler.java => TbWebSocketHandler.java} (69%) create mode 100644 application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java create mode 100644 application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java index a75ecb1353..d44c50e9cd 100644 --- a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java @@ -19,7 +19,7 @@ import java.util.Map; import org.thingsboard.server.exception.ThingsboardErrorCode; import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.controller.plugin.PluginWebSocketHandler; +import org.thingsboard.server.controller.plugin.TbWebSocketHandler; import org.thingsboard.server.service.security.model.SecurityUser; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -54,7 +54,7 @@ public class WebSocketConfiguration implements WebSocketConfigurer { @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(pluginWsHandler(), WS_PLUGIN_MAPPING).setAllowedOrigins("*") + registry.addHandler(wsHandler(), WS_PLUGIN_MAPPING).setAllowedOrigins("*") .addInterceptors(new HttpSessionHandshakeInterceptor(), new HandshakeInterceptor() { @Override @@ -82,8 +82,8 @@ public class WebSocketConfiguration implements WebSocketConfigurer { } @Bean - public WebSocketHandler pluginWsHandler() { - return new PluginWebSocketHandler(); + public WebSocketHandler wsHandler() { + return new TbWebSocketHandler(); } protected SecurityUser getCurrentUser() throws ThingsboardException { diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index 1944fa2e68..a2867cecdc 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -1,9 +1,27 @@ +/** + * Copyright © 2016-2018 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.controller; +import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -11,47 +29,54 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.async.DeferredResult; -import org.thingsboard.server.actors.plugin.ValidationResult; -import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.DataConstants; -import org.thingsboard.server.common.data.Device; -import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.audit.ActionType; -import org.thingsboard.server.common.data.id.AssetId; -import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; -import org.thingsboard.server.common.data.id.RuleChainId; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UUIDBased; +import org.thingsboard.server.common.data.kv.Aggregation; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseTsKvQuery; +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; +import org.thingsboard.server.common.data.kv.StringDataEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; -import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.kv.TsKvQuery; +import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.transport.adaptor.JsonConverter; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; +import org.thingsboard.server.extensions.api.exception.InvalidParametersException; +import org.thingsboard.server.extensions.api.exception.UncheckedApiException; import org.thingsboard.server.extensions.api.plugins.PluginConstants; import org.thingsboard.server.extensions.core.plugin.telemetry.AttributeData; +import org.thingsboard.server.extensions.core.plugin.telemetry.TsData; +import org.thingsboard.server.service.security.AccessValidator; import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; import javax.annotation.Nullable; import javax.annotation.PreDestroy; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.function.BiConsumer; import java.util.stream.Collectors; /** @@ -62,9 +87,8 @@ import java.util.stream.Collectors; @Slf4j public class TelemetryController extends BaseController { - public static final String CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "Customer user is not allowed to perform this operation!"; - public static final String SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "System administrator is not allowed to perform this operation!"; - public static final String DEVICE_WITH_REQUESTED_ID_NOT_FOUND = "Device with requested id wasn't found!"; + @Autowired + private TelemetrySubscriptionService subscriptionService; @Autowired private AttributesService attributesService; @@ -72,6 +96,9 @@ public class TelemetryController extends BaseController { @Autowired private TimeseriesService tsService; + @Autowired + private AccessValidator accessValidator; + private ExecutorService executor; public void initExecutor() { @@ -87,117 +114,277 @@ public class TelemetryController extends BaseController { @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getAttributeKeys( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { - return validateEntityAndCallback(entityType, entityIdStr, - this::getAttributeKeysCallback, - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, this::getAttributeKeysCallback); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES/{scope}", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getAttributeKeysByScope( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr , @PathVariable("scope") String scope) throws ThingsboardException { - return validateEntityAndCallback(entityType, entityIdStr, - (result, entityId) -> getAttributeKeysCallback(result, entityId, scope), - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, + (result, entityId) -> getAttributeKeysCallback(result, entityId, scope)); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getAttributes( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { SecurityUser user = getCurrentUser(); - return validateEntityAndCallback(entityType, entityIdStr, - (result, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr), - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr)); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES/{scope}", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getAttributesByScope( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @PathVariable("scope") String scope, @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { SecurityUser user = getCurrentUser(); - return validateEntityAndCallback(entityType, entityIdStr, - (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, + (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr)); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/keys/TIMESERIES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getTimeseriesKeys( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { - return validateEntityAndCallback(entityType, entityIdStr, + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, (result, entityId) -> { Futures.addCallback(tsService.findAllLatest(entityId), getTsKeysToResponseCallback(result)); - }, - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + }); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) + @ResponseBody public DeferredResult getLatestTimeseries( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, - @PathVariable("scope") String scope, @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { SecurityUser user = getCurrentUser(); - return validateEntityAndCallback(entityType, entityIdStr, - (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, + (result, entityId) -> getLatestTimeseriesValuesCallback(result, user, entityId, keysStr)); } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) - @ResponseStatus(value = HttpStatus.OK) - public DeferredResult getLatestTimeseries( + @ResponseBody + public DeferredResult getTimeseries( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, - @PathVariable("scope") String scope, - @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException { - SecurityUser user = getCurrentUser(); + @RequestParam(name = "keys") String keys, + @RequestParam(name = "startTs") Long startTs, + @RequestParam(name = "endTs") Long endTs, + @RequestParam(name = "interval", defaultValue = "0") Long interval, + @RequestParam(name = "limit", defaultValue = "100") Integer limit, + @RequestParam(name = "agg", defaultValue = "NONE") String aggStr + ) throws ThingsboardException { + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityType, entityIdStr, + (result, entityId) -> { + // If interval is 0, convert this to a NONE aggregation, which is probably what the user really wanted + Aggregation agg = interval == 0L ? Aggregation.valueOf(Aggregation.NONE.name()) : Aggregation.valueOf(aggStr); + List queries = toKeysList(keys).stream().map(key -> new BaseTsKvQuery(key, startTs, endTs, interval, limit, agg)) + .collect(Collectors.toList()); + + Futures.addCallback(tsService.findAll(entityId, queries), getTsKvListCallback(result)); + }); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult saveDeviceAttributes(@PathVariable("deviceId") String deviceIdStr, @PathVariable("scope") String scope, + @RequestBody JsonNode request) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr); + return saveAttributes(entityId, scope, request); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult saveEntityAttributesV1(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestBody JsonNode request) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + return saveAttributes(entityId, scope, request); + } - return validateEntityAndCallback(entityType, entityIdStr, - (result, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr), - (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/ATTRIBUTES/{scope}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult saveEntityAttributesV2(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestBody JsonNode request) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + return saveAttributes(entityId, scope, request); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/TIMESERIES/{scope}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult saveEntityTelemetry(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestBody String requestBody) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + return saveTelemetry(entityId, requestBody, 0L); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/TIMESERIES/{scope}/{ttl}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult saveEntityTelemetryWithTTL(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, @PathVariable("ttl") Long ttl, + @RequestBody String requestBody) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + return saveTelemetry(entityId, requestBody, ttl); } - private DeferredResult validateEntityAndCallback(String entityType, String entityIdStr, - BiConsumer, EntityId> onSuccess, BiConsumer, Throwable> onFailure) throws ThingsboardException { - final DeferredResult response = new DeferredResult<>(); + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.DELETE) + @ResponseBody + public DeferredResult deleteEntityAttributes(@PathVariable("deviceId") String deviceIdStr, + @PathVariable("scope") String scope, + @RequestParam(name = "keys") String keysStr) throws ThingsboardException { + EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr); + return deleteAttributes(entityId, scope, keysStr); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.DELETE) + @ResponseBody + public DeferredResult deleteEntityAttributes(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, + @PathVariable("scope") String scope, + @RequestParam(name = "keys") String keysStr) throws ThingsboardException { EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr); + return deleteAttributes(entityId, scope, keysStr); + } + + private DeferredResult deleteAttributes(EntityId entityIdStr, String scope, String keysStr) throws ThingsboardException { + List keys = toKeysList(keysStr); + if (keys.isEmpty()) { + return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST); + } + SecurityUser user = getCurrentUser(); + if (DataConstants.SERVER_SCOPE.equals(scope) || + DataConstants.SHARED_SCOPE.equals(scope) || + DataConstants.CLIENT_SCOPE.equals(scope)) { + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityIdStr, (result, entityId) -> { + ListenableFuture> future = attributesService.removeAll(entityId, scope, keys); + Futures.addCallback(future, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List tmp) { + logAttributesDeleted(user, entityId, scope, keys, null); + result.setResult(new ResponseEntity<>(HttpStatus.OK)); + } - validate(getCurrentUser(), entityId, new ValidationCallback(response, - new FutureCallback>() { @Override - public void onSuccess(@Nullable DeferredResult result) { - onSuccess.accept(response, entityId); + public void onFailure(Throwable t) { + logAttributesDeleted(user, entityId, scope, keys, t); + result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); + } + }, executor); + }); + } else { + return getImmediateDeferredResult("Invalid attribute scope: " + scope, HttpStatus.BAD_REQUEST); + } + } + + private DeferredResult saveAttributes(EntityId entityIdSrc, String scope, JsonNode json) throws ThingsboardException { + if (!DataConstants.SERVER_SCOPE.equals(scope) && !DataConstants.SHARED_SCOPE.equals(scope)) { + return getImmediateDeferredResult("Invalid scope: " + scope, HttpStatus.BAD_REQUEST); + } + if (json.isObject()) { + List attributes = extractRequestAttributes(json); + if (attributes.isEmpty()) { + return getImmediateDeferredResult("No attributes data found in request body!", HttpStatus.BAD_REQUEST); + } + SecurityUser user = getCurrentUser(); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityIdSrc, (result, entityId) -> { + ListenableFuture> future = attributesService.save(entityId, scope, attributes); + Futures.addCallback(future, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List tmp) { + logAttributesUpdated(user, entityId, scope, attributes, null); + result.setResult(new ResponseEntity(HttpStatus.OK)); + subscriptionService.onAttributesUpdateFromServer(entityId, scope, attributes); } @Override public void onFailure(Throwable t) { - onFailure.accept(response, t); + logAttributesUpdated(user, entityId, scope, attributes, t); + AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR); } - })); + }); + result.setResult(new ResponseEntity(HttpStatus.OK)); + }); + } else { + return getImmediateDeferredResult("Request is not a JSON object", HttpStatus.BAD_REQUEST); + } + } + + private DeferredResult saveTelemetry(EntityId entityIdSrc, String requestBody, long ttl) throws ThingsboardException { + TelemetryUploadRequest telemetryRequest; + JsonElement telemetryJson; + try { + telemetryJson = new JsonParser().parse(requestBody); + } catch (Exception e) { + return getImmediateDeferredResult("Unable to parse timeseries payload: Invalid JSON body!", HttpStatus.BAD_REQUEST); + } + try { + telemetryRequest = JsonConverter.convertToTelemetry(telemetryJson); + } catch (Exception e) { + return getImmediateDeferredResult("Unable to parse timeseries payload. Invalid JSON body: " + e.getMessage(), HttpStatus.BAD_REQUEST); + } + List entries = new ArrayList<>(); + for (Map.Entry> entry : telemetryRequest.getData().entrySet()) { + for (KvEntry kv : entry.getValue()) { + entries.add(new BasicTsKvEntry(entry.getKey(), kv)); + } + } + if (entries.isEmpty()) { + return getImmediateDeferredResult("No timeseries data found in request body!", HttpStatus.BAD_REQUEST); + } + SecurityUser user = getCurrentUser(); + return accessValidator.validateEntityAndCallback(getCurrentUser(), entityIdSrc, (result, entityId) -> { + ListenableFuture> future = tsService.save(entityId, entries, ttl); + Futures.addCallback(future, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List tmp) { + result.setResult(new ResponseEntity(HttpStatus.OK)); + subscriptionService.onTimeseriesUpdateFromServer(entityId, entries); + } - return response; + @Override + public void onFailure(Throwable t) { + AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR); + } + }); + result.setResult(new ResponseEntity(HttpStatus.OK)); + }); } - private void getAttributeValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, String scope, String keys) { - List keyList = null; - if (!StringUtils.isEmpty(keys)) { - keyList = Arrays.asList(keys.split(",")); + private void getLatestTimeseriesValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, String keys) { + ListenableFuture> future; + if (StringUtils.isEmpty(keys)) { + future = tsService.findAllLatest(entityId); + } else { + future = tsService.findLatest(entityId, toKeysList(keys)); } + Futures.addCallback(future, getTsKvListCallback(result)); + } + + private void getAttributeValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, String scope, String keys) { + List keyList = toKeysList(keys); FutureCallback> callback = getAttributeValuesToResponseCallback(result, user, scope, entityId, keyList); if (!StringUtils.isEmpty(scope)) { if (keyList != null && !keyList.isEmpty()) { @@ -247,7 +434,7 @@ public class TelemetryController extends BaseController { @Override public void onFailure(Throwable e) { log.error("Failed to fetch attributes", e); - handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + AccessValidator.handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); } }; } @@ -264,12 +451,13 @@ public class TelemetryController extends BaseController { @Override public void onFailure(Throwable e) { log.error("Failed to fetch attributes", e); - handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + AccessValidator.handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); } }; } - private FutureCallback> getAttributeValuesToResponseCallback(final DeferredResult response, final SecurityUser user, final String scope, + private FutureCallback> getAttributeValuesToResponseCallback(final DeferredResult response, + final SecurityUser user, final String scope, final EntityId entityId, final List keyList) { return new FutureCallback>() { @Override @@ -284,12 +472,32 @@ public class TelemetryController extends BaseController { public void onFailure(Throwable e) { log.error("Failed to fetch attributes", e); logAttributesRead(user, entityId, scope, keyList, e); - handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + AccessValidator.handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); } }; } - private void logAttributesRead(SecurityUser user, EntityId entityId, String scope, List keys, Throwable e) { + private FutureCallback> getTsKvListCallback(final DeferredResult response) { + return new FutureCallback>() { + @Override + public void onSuccess(List data) { + Map> result = new LinkedHashMap<>(); + for (TsKvEntry entry : data) { + result.computeIfAbsent(entry.getKey(), k -> new ArrayList<>()) + .add(new TsData(entry.getTs(), entry.getValueAsString())); + } + response.setResult(new ResponseEntity<>(result, HttpStatus.OK)); + } + + @Override + public void onFailure(Throwable e) { + log.error("Failed to fetch historical data", e); + AccessValidator.handleError(e, response, HttpStatus.INTERNAL_SERVER_ERROR); + } + }; + } + + private void logAttributesDeleted(SecurityUser user, EntityId entityId, String scope, List keys, Throwable e) { auditLogService.logEntityAction( user.getTenantId(), user.getCustomerId(), @@ -297,163 +505,39 @@ public class TelemetryController extends BaseController { user.getName(), (UUIDBased & EntityId) entityId, null, - ActionType.ATTRIBUTES_READ, + ActionType.ATTRIBUTES_DELETED, toException(e), scope, keys); } - private void handleError(Throwable e, final DeferredResult response, HttpStatus defaultErrorStatus) { - ResponseEntity responseEntity; - if (e != null && e instanceof ToErrorResponseEntity) { - responseEntity = ((ToErrorResponseEntity) e).toErrorResponseEntity(); - } else if (e != null && e instanceof IllegalArgumentException) { - responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); - } else { - responseEntity = new ResponseEntity<>(defaultErrorStatus); - } - response.setResult(responseEntity); - } - - private void validate(SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - switch (entityId.getEntityType()) { - case DEVICE: - validateDevice(currentUser, entityId, callback); - return; - case ASSET: - validateAsset(currentUser, entityId, callback); - return; - case RULE_CHAIN: - validateRuleChain(currentUser, entityId, callback); - return; - case CUSTOMER: - validateCustomer(currentUser, entityId, callback); - return; - case TENANT: - validateTenant(currentUser, entityId, callback); - return; - default: - //TODO: add support of other entities - throw new IllegalStateException("Not Implemented!"); - } - } - - private void validateDevice(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - if (currentUser.isSystemAdmin()) { - callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); - } else { - ListenableFuture deviceFuture = deviceService.findDeviceByIdAsync(new DeviceId(entityId.getId())); - Futures.addCallback(deviceFuture, getCallback(callback, device -> { - if (device == null) { - return ValidationResult.entityNotFound(DEVICE_WITH_REQUESTED_ID_NOT_FOUND); - } else { - if (!device.getTenantId().equals(currentUser.getTenantId())) { - return ValidationResult.accessDenied("Device doesn't belong to the current Tenant!"); - } else if (currentUser.isCustomerUser() && !device.getCustomerId().equals(currentUser.getCustomerId())) { - return ValidationResult.accessDenied("Device doesn't belong to the current Customer!"); - } else { - return ValidationResult.ok(); - } - } - })); - } - } - - private void validateAsset(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - if (currentUser.isSystemAdmin()) { - callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); - } else { - ListenableFuture assetFuture = assetService.findAssetByIdAsync(new AssetId(entityId.getId())); - Futures.addCallback(assetFuture, getCallback(callback, asset -> { - if (asset == null) { - return ValidationResult.entityNotFound("Asset with requested id wasn't found!"); - } else { - if (!asset.getTenantId().equals(currentUser.getTenantId())) { - return ValidationResult.accessDenied("Asset doesn't belong to the current Tenant!"); - } else if (currentUser.isCustomerUser() && !asset.getCustomerId().equals(currentUser.getCustomerId())) { - return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); - } else { - return ValidationResult.ok(); - } - } - })); - } - } - - - private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - if (currentUser.isCustomerUser()) { - callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); - } else { - ListenableFuture ruleChainFuture = ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); - Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { - if (ruleChain == null) { - return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); - } else { - if (currentUser.isTenantAdmin() && !ruleChain.getTenantId().equals(currentUser.getTenantId())) { - return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); - } else if (currentUser.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { - return ValidationResult.accessDenied("Rule chain is not in system scope!"); - } else { - return ValidationResult.ok(); - } - } - })); - } - } - - private void validateCustomer(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - if (currentUser.isSystemAdmin()) { - callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); - } else { - ListenableFuture customerFuture = customerService.findCustomerByIdAsync(new CustomerId(entityId.getId())); - Futures.addCallback(customerFuture, getCallback(callback, customer -> { - if (customer == null) { - return ValidationResult.entityNotFound("Customer with requested id wasn't found!"); - } else { - if (!customer.getTenantId().equals(currentUser.getTenantId())) { - return ValidationResult.accessDenied("Customer doesn't belong to the current Tenant!"); - } else if (currentUser.isCustomerUser() && !customer.getId().equals(currentUser.getCustomerId())) { - return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); - } else { - return ValidationResult.ok(); - } - } - })); - } - } - - private void validateTenant(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { - if (currentUser.isCustomerUser()) { - callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); - } else if (currentUser.isSystemAdmin()) { - callback.onSuccess(ValidationResult.ok()); - } else { - ListenableFuture tenantFuture = tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); - Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { - if (tenant == null) { - return ValidationResult.entityNotFound("Tenant with requested id wasn't found!"); - } else if (!tenant.getId().equals(currentUser.getTenantId())) { - return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); - } else { - return ValidationResult.ok(); - } - })); - } + private void logAttributesUpdated(SecurityUser user, EntityId entityId, String scope, List attributes, Throwable e) { + auditLogService.logEntityAction( + user.getTenantId(), + user.getCustomerId(), + user.getId(), + user.getName(), + (UUIDBased & EntityId) entityId, + null, + ActionType.ATTRIBUTES_UPDATED, + toException(e), + scope, + attributes); } - private FutureCallback getCallback(ValidationCallback callback, Function transformer) { - return new FutureCallback() { - @Override - public void onSuccess(@Nullable T result) { - callback.onSuccess(transformer.apply(result)); - } - @Override - public void onFailure(Throwable t) { - callback.onFailure(t); - } - }; + private void logAttributesRead(SecurityUser user, EntityId entityId, String scope, List keys, Throwable e) { + auditLogService.logEntityAction( + user.getTenantId(), + user.getCustomerId(), + user.getId(), + user.getName(), + (UUIDBased & EntityId) entityId, + null, + ActionType.ATTRIBUTES_READ, + toException(e), + scope, + keys); } private ListenableFuture> mergeAllAttributesFutures(List>> futures) { @@ -467,4 +551,40 @@ public class TelemetryController extends BaseController { }, executor); } + private List toKeysList(String keys) { + List keyList = null; + if (!StringUtils.isEmpty(keys)) { + keyList = Arrays.asList(keys.split(",")); + } + return keyList; + } + + private DeferredResult getImmediateDeferredResult(String message, HttpStatus status) { + DeferredResult result = new DeferredResult<>(); + result.setResult(new ResponseEntity<>(message, status)); + return result; + } + + private List extractRequestAttributes(JsonNode jsonNode) { + long ts = System.currentTimeMillis(); + List attributes = new ArrayList<>(); + jsonNode.fields().forEachRemaining(entry -> { + String key = entry.getKey(); + JsonNode value = entry.getValue(); + if (entry.getValue().isTextual()) { + attributes.add(new BaseAttributeKvEntry(new StringDataEntry(key, value.textValue()), ts)); + } else if (entry.getValue().isBoolean()) { + attributes.add(new BaseAttributeKvEntry(new BooleanDataEntry(key, value.booleanValue()), ts)); + } else if (entry.getValue().isDouble()) { + attributes.add(new BaseAttributeKvEntry(new DoubleDataEntry(key, value.doubleValue()), ts)); + } else if (entry.getValue().isNumber()) { + if (entry.getValue().isBigInteger()) { + throw new UncheckedApiException(new InvalidParametersException("Big integer values are not supported!")); + } else { + attributes.add(new BaseAttributeKvEntry(new LongDataEntry(key, value.longValue()), ts)); + } + } + }); + return attributes; + } } diff --git a/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java b/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java index ead90ea2f2..6b2718f568 100644 --- a/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java +++ b/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java index 8e3cee4d5d..045835e1b6 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java @@ -48,59 +48,59 @@ import javax.servlet.http.HttpServletRequest; @Slf4j public class PluginApiController extends BaseController { - @SuppressWarnings("rawtypes") - @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{pluginToken}/**") - @ResponseStatus(value = HttpStatus.OK) - public DeferredResult processRequest( - @PathVariable("pluginToken") String pluginToken, - RequestEntity requestEntity, - HttpServletRequest request) - throws ThingsboardException { - log.debug("[{}] Going to process requst uri: {}", pluginToken, requestEntity.getUrl()); - DeferredResult result = new DeferredResult(); - PluginMetaData pluginMd = pluginService.findPluginByApiToken(pluginToken); - if (pluginMd == null) { - result.setErrorResult(new PluginNotFoundException("Plugin with token: " + pluginToken + " not found!")); - } else { - TenantId tenantId = getCurrentUser().getTenantId(); - CustomerId customerId = getCurrentUser().getCustomerId(); - if (validatePluginAccess(pluginMd, tenantId, customerId)) { - if(tenantId != null && ModelConstants.NULL_UUID.equals(tenantId.getId())){ - tenantId = null; - } - UserId userId = getCurrentUser().getId(); - String userName = getCurrentUser().getName(); - PluginApiCallSecurityContext securityCtx = new PluginApiCallSecurityContext(pluginMd.getTenantId(), pluginMd.getId(), - tenantId, customerId, userId, userName); - actorService.process(new BasicPluginRestMsg(securityCtx, new RestRequest(requestEntity, request), result)); - } else { - result.setResult(new ResponseEntity<>(HttpStatus.FORBIDDEN)); - } - - } - return result; - } - - public static boolean validatePluginAccess(PluginMetaData pluginMd, TenantId tenantId, CustomerId customerId) { - boolean systemAdministrator = tenantId == null || ModelConstants.NULL_UUID.equals(tenantId.getId()); - boolean tenantAdministrator = !systemAdministrator && (customerId == null || ModelConstants.NULL_UUID.equals(customerId.getId())); - boolean systemPlugin = ModelConstants.NULL_UUID.equals(pluginMd.getTenantId().getId()); - - boolean validUser = false; - if (systemPlugin) { - if (pluginMd.isPublicAccess() || systemAdministrator) { - // All users can access public system plugins. Only system - // users can access private system plugins - validUser = true; - } - } else { - if ((pluginMd.isPublicAccess() || tenantAdministrator) && tenantId != null && tenantId.equals(pluginMd.getTenantId())) { - // All tenant users can access public tenant plugins. Only tenant - // administrator can access private tenant plugins - validUser = true; - } - } - return validUser; - } +// @SuppressWarnings("rawtypes") +// @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") +// @RequestMapping(value = "/{pluginToken}/**") +// @ResponseStatus(value = HttpStatus.OK) +// public DeferredResult processRequest( +// @PathVariable("pluginToken") String pluginToken, +// RequestEntity requestEntity, +// HttpServletRequest request) +// throws ThingsboardException { +// log.debug("[{}] Going to process requst uri: {}", pluginToken, requestEntity.getUrl()); +// DeferredResult result = new DeferredResult(); +// PluginMetaData pluginMd = pluginService.findPluginByApiToken(pluginToken); +// if (pluginMd == null) { +// result.setErrorResult(new PluginNotFoundException("Plugin with token: " + pluginToken + " not found!")); +// } else { +// TenantId tenantId = getCurrentUser().getTenantId(); +// CustomerId customerId = getCurrentUser().getCustomerId(); +// if (validatePluginAccess(pluginMd, tenantId, customerId)) { +// if(tenantId != null && ModelConstants.NULL_UUID.equals(tenantId.getId())){ +// tenantId = null; +// } +// UserId userId = getCurrentUser().getId(); +// String userName = getCurrentUser().getName(); +// PluginApiCallSecurityContext securityCtx = new PluginApiCallSecurityContext(pluginMd.getTenantId(), pluginMd.getId(), +// tenantId, customerId, userId, userName); +// actorService.process(new BasicPluginRestMsg(securityCtx, new RestRequest(requestEntity, request), result)); +// } else { +// result.setResult(new ResponseEntity<>(HttpStatus.FORBIDDEN)); +// } +// +// } +// return result; +// } +// +// public static boolean validatePluginAccess(PluginMetaData pluginMd, TenantId tenantId, CustomerId customerId) { +// boolean systemAdministrator = tenantId == null || ModelConstants.NULL_UUID.equals(tenantId.getId()); +// boolean tenantAdministrator = !systemAdministrator && (customerId == null || ModelConstants.NULL_UUID.equals(customerId.getId())); +// boolean systemPlugin = ModelConstants.NULL_UUID.equals(pluginMd.getTenantId().getId()); +// +// boolean validUser = false; +// if (systemPlugin) { +// if (pluginMd.isPublicAccess() || systemAdministrator) { +// // All users can access public system plugins. Only system +// // users can access private system plugins +// validUser = true; +// } +// } else { +// if ((pluginMd.isPublicAccess() || tenantAdministrator) && tenantId != null && tenantId.equals(pluginMd.getTenantId())) { +// // All tenant users can access public tenant plugins. Only tenant +// // administrator can access private tenant plugins +// validUser = true; +// } +// } +// return validUser; +// } } diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java similarity index 69% rename from application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java rename to application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java index 7f835ed5bf..800bc3bbf9 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,57 +15,42 @@ */ package org.thingsboard.server.controller.plugin; -import java.io.IOException; -import java.net.URI; -import java.security.InvalidParameterException; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.BeanCreationNotAllowedException; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.thingsboard.server.actors.service.ActorService; -import org.thingsboard.server.common.data.id.UserId; -import org.thingsboard.server.config.WebSocketConfiguration; -import org.thingsboard.server.extensions.api.plugins.PluginConstants; -import org.thingsboard.server.service.security.model.SecurityUser; -import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.dao.plugin.PluginService; -import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; -import org.thingsboard.server.extensions.api.plugins.ws.BasicPluginWebsocketSessionRef; -import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; -import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; -import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; -import org.thingsboard.server.extensions.api.plugins.ws.msg.SessionEventPluginWebSocketMsg; -import org.thingsboard.server.extensions.api.plugins.ws.msg.TextPluginWebSocketMsg; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.TextWebSocketHandler; +import org.thingsboard.server.config.WebSocketConfiguration; +import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; +import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; +import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; +import org.thingsboard.server.extensions.api.plugins.ws.msg.TextPluginWebSocketMsg; +import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.service.telemetry.TelemetryWebSocketMsgEndpoint; +import org.thingsboard.server.service.telemetry.TelemetryWebSocketService; +import org.thingsboard.server.service.telemetry.TelemetryWebSocketSessionRef; + +import java.io.IOException; +import java.net.URI; +import java.security.InvalidParameterException; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; @Service @Slf4j -public class PluginWebSocketHandler extends TextWebSocketHandler implements PluginWebSocketMsgEndpoint { +public class TbWebSocketHandler extends TextWebSocketHandler implements PluginWebSocketMsgEndpoint, TelemetryWebSocketMsgEndpoint { private static final ConcurrentMap internalSessionMap = new ConcurrentHashMap<>(); private static final ConcurrentMap externalSessionMap = new ConcurrentHashMap<>(); @Autowired @Lazy - private ActorService actorService; - - @Autowired - @Lazy - private PluginService pluginService; + private TelemetryWebSocketService webSocketService; @Override public void handleTextMessage(WebSocketSession session, TextMessage message) { @@ -73,7 +58,7 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug log.info("[{}] Processing {}", session.getId(), message); SessionMetaData sessionMd = internalSessionMap.get(session.getId()); if (sessionMd != null) { - actorService.process(new TextPluginWebSocketMsg(sessionMd.sessionRef, message.getPayload())); + webSocketService.handleWebSocketMsg(sessionMd.sessionRef, message.getPayload()); } else { log.warn("[{}] Failed to find session", session.getId()); session.close(CloseStatus.SERVER_ERROR.withReason("Session not found!")); @@ -88,11 +73,11 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug super.afterConnectionEstablished(session); try { String internalSessionId = session.getId(); - PluginWebsocketSessionRef sessionRef = toRef(session); + TelemetryWebSocketSessionRef sessionRef = toRef(session); String externalSessionId = sessionRef.getSessionId(); internalSessionMap.put(internalSessionId, new SessionMetaData(session, sessionRef)); externalSessionMap.put(externalSessionId, internalSessionId); - actorService.process(new SessionEventPluginWebSocketMsg(sessionRef, SessionEvent.onEstablished())); + processInWebSocketService(sessionRef, SessionEvent.onEstablished()); log.info("[{}][{}] Session is started", externalSessionId, session.getId()); } catch (InvalidParameterException e) { log.warn("[[{}] Failed to start session", session.getId(), e); @@ -108,7 +93,7 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug super.handleTransportError(session, tError); SessionMetaData sessionMd = internalSessionMap.get(session.getId()); if (sessionMd != null) { - processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError))); + processInWebSocketService(sessionMd.sessionRef, SessionEvent.onError(tError)); } else { log.warn("[{}] Failed to find session", session.getId()); } @@ -121,20 +106,20 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug SessionMetaData sessionMd = internalSessionMap.remove(session.getId()); if (sessionMd != null) { externalSessionMap.remove(sessionMd.sessionRef.getSessionId()); - processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed())); + processInWebSocketService(sessionMd.sessionRef, SessionEvent.onClosed()); } log.info("[{}] Session is closed", session.getId()); } - private void processInActorService(SessionEventPluginWebSocketMsg msg) { + private void processInWebSocketService(TelemetryWebSocketSessionRef sessionRef, SessionEvent event) { try { - actorService.process(msg); + webSocketService.handleWebSocketSessionEvent(sessionRef, event); } catch (BeanCreationNotAllowedException e) { - log.warn("[{}] Failed to close session due to possible shutdown state", msg.getSessionRef().getSessionId()); + log.warn("[{}] Failed to close session due to possible shutdown state", sessionRef.getSessionId()); } } - private PluginWebsocketSessionRef toRef(WebSocketSession session) throws IOException { + private TelemetryWebSocketSessionRef toRef(WebSocketSession session) throws IOException { URI sessionUri = session.getUri(); String path = sessionUri.getPath(); path = path.substring(WebSocketConfiguration.WS_PLUGIN_PREFIX.length()); @@ -142,39 +127,61 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug throw new IllegalArgumentException("URL should contain plugin token!"); } String[] pathElements = path.split("/"); - String pluginToken = pathElements[0]; - // TODO: cache - PluginMetaData pluginMd = pluginService.findPluginByApiToken(pluginToken); - if (pluginMd == null) { + String serviceToken = pathElements[0]; + if (!"telemetry".equalsIgnoreCase(serviceToken)) { throw new InvalidParameterException("Can't find plugin with specified token!"); } else { SecurityUser currentUser = (SecurityUser) session.getAttributes().get(WebSocketConfiguration.WS_SECURITY_USER_ATTRIBUTE); - TenantId tenantId = currentUser.getTenantId(); - CustomerId customerId = currentUser.getCustomerId(); - if (PluginApiController.validatePluginAccess(pluginMd, tenantId, customerId)) { - UserId userId = currentUser.getId(); - String userName = currentUser.getName(); - PluginApiCallSecurityContext securityCtx = new PluginApiCallSecurityContext(pluginMd.getTenantId(), pluginMd.getId(), tenantId, - currentUser.getCustomerId(), userId, userName); - return new BasicPluginWebsocketSessionRef(UUID.randomUUID().toString(), securityCtx, session.getUri(), session.getAttributes(), - session.getLocalAddress(), session.getRemoteAddress()); - } else { - throw new SecurityException("Current user is not allowed to use this plugin!"); - } + return new TelemetryWebSocketSessionRef(UUID.randomUUID().toString(), currentUser, session.getLocalAddress(), session.getRemoteAddress()); } } private static class SessionMetaData { private final WebSocketSession session; - private final PluginWebsocketSessionRef sessionRef; + private final TelemetryWebSocketSessionRef sessionRef; - public SessionMetaData(WebSocketSession session, PluginWebsocketSessionRef sessionRef) { + public SessionMetaData(WebSocketSession session, TelemetryWebSocketSessionRef sessionRef) { super(); this.session = session; this.sessionRef = sessionRef; } } + @Override + public void send(TelemetryWebSocketSessionRef sessionRef, String msg) throws IOException { + String externalId = sessionRef.getSessionId(); + log.debug("[{}] Processing {}", externalId, msg); + String internalId = externalSessionMap.get(externalId); + if (internalId != null) { + SessionMetaData sessionMd = internalSessionMap.get(internalId); + if (sessionMd != null) { + sessionMd.session.sendMessage(new TextMessage(msg)); + } else { + log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId); + } + } else { + log.warn("[{}] Failed to find session by external id", externalId); + } + } + + @Override + public void close(TelemetryWebSocketSessionRef sessionRef) throws IOException { + String externalId = sessionRef.getSessionId(); + log.debug("[{}] Processing close request", externalId); + String internalId = externalSessionMap.get(externalId); + if (internalId != null) { + SessionMetaData sessionMd = internalSessionMap.get(internalId); + if (sessionMd != null) { + sessionMd.session.close(CloseStatus.NORMAL); + } else { + log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId); + } + } else { + log.warn("[{}] Failed to find session by external id", externalId); + } + } + + //TODO: remove @Override public void send(PluginWebsocketMsg wsMsg) throws IOException { PluginWebsocketSessionRef sessionRef = wsMsg.getSessionRef(); @@ -196,6 +203,7 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug } } + //TODO: remove @Override public void close(PluginWebsocketSessionRef sessionRef) throws IOException { String externalId = sessionRef.getSessionId(); @@ -212,5 +220,4 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug log.warn("[{}] Failed to find session by external id", externalId); } } - } diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java new file mode 100644 index 0000000000..01bd23869d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -0,0 +1,262 @@ +package org.thingsboard.server.service.security; + +import com.google.common.base.Function; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.controller.ValidationCallback; +import org.thingsboard.server.dao.alarm.AlarmService; +import org.thingsboard.server.dao.asset.AssetService; +import org.thingsboard.server.dao.customer.CustomerService; +import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.dao.tenant.TenantService; +import org.thingsboard.server.dao.user.UserService; +import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; +import org.thingsboard.server.service.security.model.SecurityUser; + +import javax.annotation.Nullable; +import java.util.function.BiConsumer; + +/** + * Created by ashvayka on 27.03.18. + */ +@Component +public class AccessValidator { + + public static final String CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "Customer user is not allowed to perform this operation!"; + public static final String SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "System administrator is not allowed to perform this operation!"; + public static final String DEVICE_WITH_REQUESTED_ID_NOT_FOUND = "Device with requested id wasn't found!"; + + @Autowired + protected TenantService tenantService; + + @Autowired + protected CustomerService customerService; + + @Autowired + protected UserService userService; + + @Autowired + protected DeviceService deviceService; + + @Autowired + protected AssetService assetService; + + @Autowired + protected AlarmService alarmService; + + @Autowired + protected RuleChainService ruleChainService; + + public DeferredResult validateEntityAndCallback(SecurityUser currentUser, String entityType, String entityIdStr, + BiConsumer, EntityId> onSuccess) throws ThingsboardException { + return validateEntityAndCallback(currentUser, entityType, entityIdStr, onSuccess, (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + public DeferredResult validateEntityAndCallback(SecurityUser currentUser, String entityType, String entityIdStr, + BiConsumer, EntityId> onSuccess, + BiConsumer, Throwable> onFailure) throws ThingsboardException { + return validateEntityAndCallback(currentUser, EntityIdFactory.getByTypeAndId(entityType, entityIdStr), + onSuccess, onFailure); + } + + public DeferredResult validateEntityAndCallback(SecurityUser currentUser, EntityId entityId, + BiConsumer, EntityId> onSuccess) throws ThingsboardException { + return validateEntityAndCallback(currentUser, entityId, onSuccess, (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); + } + + public DeferredResult validateEntityAndCallback(SecurityUser currentUser, EntityId entityId, + BiConsumer, EntityId> onSuccess, + BiConsumer, Throwable> onFailure) throws ThingsboardException { + + final DeferredResult response = new DeferredResult<>(); + + validate(currentUser, entityId, new ValidationCallback(response, + new FutureCallback>() { + @Override + public void onSuccess(@Nullable DeferredResult result) { + onSuccess.accept(response, entityId); + } + + @Override + public void onFailure(Throwable t) { + onFailure.accept(response, t); + } + })); + + return response; + } + + public void validate(SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + switch (entityId.getEntityType()) { + case DEVICE: + validateDevice(currentUser, entityId, callback); + return; + case ASSET: + validateAsset(currentUser, entityId, callback); + return; + case RULE_CHAIN: + validateRuleChain(currentUser, entityId, callback); + return; + case CUSTOMER: + validateCustomer(currentUser, entityId, callback); + return; + case TENANT: + validateTenant(currentUser, entityId, callback); + return; + default: + //TODO: add support of other entities + throw new IllegalStateException("Not Implemented!"); + } + } + + private void validateDevice(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture deviceFuture = deviceService.findDeviceByIdAsync(new DeviceId(entityId.getId())); + Futures.addCallback(deviceFuture, getCallback(callback, device -> { + if (device == null) { + return ValidationResult.entityNotFound(DEVICE_WITH_REQUESTED_ID_NOT_FOUND); + } else { + if (!device.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Device doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !device.getCustomerId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Device doesn't belong to the current Customer!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validateAsset(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture assetFuture = assetService.findAssetByIdAsync(new AssetId(entityId.getId())); + Futures.addCallback(assetFuture, getCallback(callback, asset -> { + if (asset == null) { + return ValidationResult.entityNotFound("Asset with requested id wasn't found!"); + } else { + if (!asset.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Asset doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !asset.getCustomerId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + + private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isCustomerUser()) { + callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture ruleChainFuture = ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId())); + Futures.addCallback(ruleChainFuture, getCallback(callback, ruleChain -> { + if (ruleChain == null) { + return ValidationResult.entityNotFound("Rule chain with requested id wasn't found!"); + } else { + if (currentUser.isTenantAdmin() && !ruleChain.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); + } else if (currentUser.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { + return ValidationResult.accessDenied("Rule chain is not in system scope!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validateCustomer(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture customerFuture = customerService.findCustomerByIdAsync(new CustomerId(entityId.getId())); + Futures.addCallback(customerFuture, getCallback(callback, customer -> { + if (customer == null) { + return ValidationResult.entityNotFound("Customer with requested id wasn't found!"); + } else { + if (!customer.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Customer doesn't belong to the current Tenant!"); + } else if (currentUser.isCustomerUser() && !customer.getId().equals(currentUser.getCustomerId())) { + return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); + } else { + return ValidationResult.ok(); + } + } + })); + } + } + + private void validateTenant(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + if (currentUser.isCustomerUser()) { + callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else if (currentUser.isSystemAdmin()) { + callback.onSuccess(ValidationResult.ok()); + } else { + ListenableFuture tenantFuture = tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); + Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { + if (tenant == null) { + return ValidationResult.entityNotFound("Tenant with requested id wasn't found!"); + } else if (!tenant.getId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); + } else { + return ValidationResult.ok(); + } + })); + } + } + + private FutureCallback getCallback(ValidationCallback callback, Function transformer) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable T result) { + callback.onSuccess(transformer.apply(result)); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } + + public static void handleError(Throwable e, final DeferredResult response, HttpStatus defaultErrorStatus) { + ResponseEntity responseEntity; + if (e != null && e instanceof ToErrorResponseEntity) { + responseEntity = ((ToErrorResponseEntity) e).toErrorResponseEntity(); + } else if (e != null && e instanceof IllegalArgumentException) { + responseEntity = new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + } else { + responseEntity = new ResponseEntity<>(defaultErrorStatus); + } + response.setResult(responseEntity); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java new file mode 100644 index 0000000000..359949eef9 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java @@ -0,0 +1,42 @@ +package org.thingsboard.server.service.telemetry; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.Subscription; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created by ashvayka on 27.03.18. + */ +@Service +@Slf4j +public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptionService { + + @Autowired + private TelemetryWebSocketService wsService; + + + private final Map> subscriptionsByEntityId = new HashMap<>(); + + private final Map> subscriptionsByWsSessionId = new HashMap<>(); + + + + @Override + public void onAttributesUpdateFromServer(EntityId entityId, String scope, List attributes) { + + } + + @Override + public void onTimeseriesUpdateFromServer(EntityId entityId, List entries) { + + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java new file mode 100644 index 0000000000..6d6c33e65b --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java @@ -0,0 +1,261 @@ +package org.thingsboard.server.service.telemetry; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.FutureCallback; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; +import org.thingsboard.server.common.data.DataConstants; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; +import org.thingsboard.server.extensions.api.exception.UnauthorizedException; +import org.thingsboard.server.extensions.api.plugins.PluginCallback; +import org.thingsboard.server.extensions.api.plugins.PluginContext; +import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; +import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.AttributesSubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.SubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmdsWrapper; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionErrorCode; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.stream.Collectors; + +/** + * Created by ashvayka on 27.03.18. + */ +@Service +@Slf4j +public class DefaultTelemetryWebSocketService implements TelemetryWebSocketService { + + private static final int UNKNOWN_SUBSCRIPTION_ID = 0; + private static final String PROCESSING_MSG = "[{}] Processing: {}"; + private static final ObjectMapper jsonMapper = new ObjectMapper(); + private static final String FAILED_TO_FETCH_DATA = "Failed to fetch data!"; + private static final String FAILED_TO_FETCH_ATTRIBUTES = "Failed to fetch attributes!"; + private static final String SESSION_META_DATA_NOT_FOUND = "Session meta-data not found!"; + + private final ConcurrentMap wsSessionsMap = new ConcurrentHashMap<>(); + + @Autowired + private TelemetrySubscriptionService subscriptionManager; + + @Autowired + private TelemetryWebSocketMsgEndpoint msgEndpoint; + + @Autowired + private AttributesService attributesService; + + @Autowired + private TimeseriesService tsService; + + @Override + public void handleWebSocketSessionEvent(TelemetryWebSocketSessionRef sessionRef, SessionEvent event) { + String sessionId = sessionRef.getSessionId(); + log.debug(PROCESSING_MSG, sessionId, event); + switch (event.getEventType()) { + case ESTABLISHED: + wsSessionsMap.put(sessionId, new WsSessionMetaData(sessionRef)); + break; + case ERROR: + log.debug("[{}] Unknown websocket session error: {}. ", sessionId, event.getError().orElse(null)); + break; + case CLOSED: + wsSessionsMap.remove(sessionId); + subscriptionManager.cleanupLocalWsSessionSubscriptions(sessionRef, sessionId); + break; + } + } + + @Override + public void handleWebSocketMsg(TelemetryWebSocketSessionRef sessionRef, String msg) { + if (log.isTraceEnabled()) { + log.trace("[{}] Processing: {}", sessionRef.getSessionId(), msg); + } + + try { + TelemetryPluginCmdsWrapper cmdsWrapper = jsonMapper.readValue(msg, TelemetryPluginCmdsWrapper.class); + if (cmdsWrapper != null) { + if (cmdsWrapper.getAttrSubCmds() != null) { + cmdsWrapper.getAttrSubCmds().forEach(cmd -> handleWsAttributesSubscriptionCmd(sessionRef, cmd)); + } + if (cmdsWrapper.getTsSubCmds() != null) { + cmdsWrapper.getTsSubCmds().forEach(cmd -> handleWsTimeseriesSubscriptionCmd(sessionRef, cmd)); + } + if (cmdsWrapper.getHistoryCmds() != null) { + cmdsWrapper.getHistoryCmds().forEach(cmd -> handleWsHistoryCmd(sessionRef, cmd)); + } + } + } catch (IOException e) { + log.warn("Failed to decode subscription cmd: {}", e.getMessage(), e); + SubscriptionUpdate update = new SubscriptionUpdate(UNKNOWN_SUBSCRIPTION_ID, SubscriptionErrorCode.INTERNAL_ERROR, SESSION_META_DATA_NOT_FOUND); + sendWsMsg(sessionRef, update); + } + } + + private void handleWsAttributesSubscriptionCmd(TelemetryWebSocketSessionRef sessionRef, AttributesSubscriptionCmd cmd) { + String sessionId = sessionRef.getSessionId(); + log.debug("[{}] Processing: {}", sessionId, cmd); + + if (validateSessionMetadata(sessionRef, cmd, sessionId)) { + if (cmd.isUnsubscribe()) { + unsubscribe(sessionRef, cmd, sessionId); + } else if (validateSubscriptionCmd(sessionRef, cmd)) { + EntityId entityId = EntityIdFactory.getByTypeAndId(cmd.getEntityType(), cmd.getEntityId()); + log.debug("[{}] fetching latest attributes ({}) values for device: {}", sessionId, cmd.getKeys(), entityId); + Optional> keysOptional = getKeys(cmd); + if (keysOptional.isPresent()) { + List keys = new ArrayList<>(keysOptional.get()); + handleWsAttributesSubscriptionByKeys(sessionRef, cmd, sessionId, entityId, keys); + } else { + handleWsAttributesSubscription(sessionRef, cmd, sessionId, entityId); + } + } + } + } + + private void handleWsAttributesSubscriptionByKeys(TelemetryWebSocketSessionRef sessionRef, + AttributesSubscriptionCmd cmd, String sessionId, EntityId entityId, + List keys) { + FutureCallback> callback = new FutureCallback>() { + @Override + public void onSuccess(List data) { + List attributesData = data.stream().map(d -> new BasicTsKvEntry(d.getLastUpdateTs(), d)).collect(Collectors.toList()); + sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), attributesData)); + + Map subState = new HashMap<>(keys.size()); + keys.forEach(key -> subState.put(key, 0L)); + attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); + + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, false, subState, cmd.getScope()); + subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); + } + + @Override + public void onFailure(Throwable e) { + log.error(FAILED_TO_FETCH_ATTRIBUTES, e); + SubscriptionUpdate update; + if (UnauthorizedException.class.isInstance(e)) { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.UNAUTHORIZED, + SubscriptionErrorCode.UNAUTHORIZED.getDefaultMsg()); + } else { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + FAILED_TO_FETCH_ATTRIBUTES); + } + sendWsMsg(sessionRef, update); + } + }; + + if (StringUtils.isEmpty(cmd.getScope())) { + //ValidationCallback? + ctx.loadAttributes(entityId, Arrays.asList(DataConstants.allScopes()), keys, callback); + } else { + ctx.loadAttributes(entityId, cmd.getScope(), keys, callback); + } + } + + private void handleWsAttributesSubscription(PluginContext ctx, PluginWebsocketSessionRef sessionRef, + AttributesSubscriptionCmd cmd, String sessionId, EntityId entityId) { + PluginCallback> callback = new PluginCallback>() { + @Override + public void onSuccess(PluginContext ctx, List data) { + List attributesData = data.stream().map(d -> new BasicTsKvEntry(d.getLastUpdateTs(), d)).collect(Collectors.toList()); + sendWsMsg(ctx, sessionRef, new SubscriptionUpdate(cmd.getCmdId(), attributesData)); + + Map subState = new HashMap<>(attributesData.size()); + attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); + + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, true, subState, cmd.getScope()); + subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); + } + + @Override + public void onFailure(PluginContext ctx, Exception e) { + log.error(FAILED_TO_FETCH_ATTRIBUTES, e); + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + FAILED_TO_FETCH_ATTRIBUTES); + sendWsMsg(ctx, sessionRef, update); + } + }; + + if (StringUtils.isEmpty(cmd.getScope())) { + ctx.loadAttributes(entityId, Arrays.asList(DataConstants.allScopes()), callback); + } else { + ctx.loadAttributes(entityId, cmd.getScope(), callback); + } + } + + private void unsubscribe(TelemetryWebSocketSessionRef sessionRef, SubscriptionCmd cmd, String sessionId) { + if (cmd.getEntityId() == null || cmd.getEntityId().isEmpty()) { + subscriptionManager.cleanupLocalWsSessionSubscriptions(sessionRef, sessionId); + } else { + subscriptionManager.removeSubscription(sessionId, cmd.getCmdId()); + } + } + + private boolean validateSubscriptionCmd(TelemetryWebSocketSessionRef sessionRef, SubscriptionCmd cmd) { + if (cmd.getEntityId() == null || cmd.getEntityId().isEmpty()) { + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.BAD_REQUEST, + "Device id is empty!"); + sendWsMsg(sessionRef, update); + return false; + } + return true; + } + + private boolean validateSessionMetadata(TelemetryWebSocketSessionRef sessionRef, SubscriptionCmd cmd, String sessionId) { + WsSessionMetaData sessionMD = wsSessionsMap.get(sessionId); + if (sessionMD == null) { + log.warn("[{}] Session meta data not found. ", sessionId); + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + SESSION_META_DATA_NOT_FOUND); + sendWsMsg(sessionRef, update); + return false; + } else { + return true; + } + } + + private void sendWsMsg(TelemetryWebSocketSessionRef sessionRef, SubscriptionUpdate update) { + try { + msgEndpoint.send(sessionRef, jsonMapper.writeValueAsString(update)); + } catch (JsonProcessingException e) { + log.warn("[{}] Failed to encode reply: {}", sessionRef.getSessionId(), update, e); + } catch (IOException e) { + log.warn("[{}] Failed to send reply: {}", sessionRef.getSessionId(), update, e); + } + } + + private static Optional> getKeys(TelemetryPluginCmd cmd) { + if (!StringUtils.isEmpty(cmd.getKeys())) { + Set keys = new HashSet<>(); + Collections.addAll(keys, cmd.getKeys().split(",")); + return Optional.of(keys); + } else { + return Optional.empty(); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java new file mode 100644 index 0000000000..9673629e9d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java @@ -0,0 +1,24 @@ +package org.thingsboard.server.service.telemetry; + +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; + +import java.util.List; + +/** + * Created by ashvayka on 27.03.18. + */ +public interface TelemetrySubscriptionService { + + void onAttributesUpdateFromServer(EntityId entityId, String scope, List attributes); + + void onTimeseriesUpdateFromServer(EntityId entityId, List entries); + + void cleanupLocalWsSessionSubscriptions(TelemetryWebSocketSessionRef sessionRef, String sessionId); + + void removeSubscription(String sessionId, int cmdId); + + void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub); +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java new file mode 100644 index 0000000000..a7e7cad1c3 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java @@ -0,0 +1,14 @@ +package org.thingsboard.server.service.telemetry; + +import java.io.IOException; + +/** + * Created by ashvayka on 27.03.18. + */ +public interface TelemetryWebSocketMsgEndpoint { + + void send(TelemetryWebSocketSessionRef sessionRef, String msg) throws IOException; + + void close(TelemetryWebSocketSessionRef sessionRef) throws IOException; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java new file mode 100644 index 0000000000..883a174eed --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java @@ -0,0 +1,13 @@ +package org.thingsboard.server.service.telemetry; + +import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; + +/** + * Created by ashvayka on 27.03.18. + */ +public interface TelemetryWebSocketService { + + void handleWebSocketSessionEvent(TelemetryWebSocketSessionRef sessionRef, SessionEvent sessionEvent); + + void handleWebSocketMsg(TelemetryWebSocketSessionRef sessionRef, String msg); +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java new file mode 100644 index 0000000000..3fd4b19fb3 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java @@ -0,0 +1,53 @@ +package org.thingsboard.server.service.telemetry; + +import lombok.Getter; +import org.thingsboard.server.service.security.model.SecurityUser; + +import java.net.InetSocketAddress; +import java.util.Objects; + +/** + * Created by ashvayka on 27.03.18. + */ +public class TelemetryWebSocketSessionRef { + + private static final long serialVersionUID = 1L; + + @Getter + private final String sessionId; + @Getter + private final SecurityUser securityCtx; + @Getter + private final InetSocketAddress localAddress; + @Getter + private final InetSocketAddress remoteAddress; + + public TelemetryWebSocketSessionRef(String sessionId, SecurityUser securityCtx, InetSocketAddress localAddress, InetSocketAddress remoteAddress) { + this.sessionId = sessionId; + this.securityCtx = securityCtx; + this.localAddress = localAddress; + this.remoteAddress = remoteAddress; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TelemetryWebSocketSessionRef that = (TelemetryWebSocketSessionRef) o; + return Objects.equals(sessionId, that.sessionId); + } + + @Override + public int hashCode() { + return Objects.hash(sessionId); + } + + @Override + public String toString() { + return "TelemetryWebSocketSessionRef{" + + "sessionId='" + sessionId + '\'' + + ", localAddress=" + localAddress + + ", remoteAddress=" + remoteAddress + + '}'; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java new file mode 100644 index 0000000000..6d57122a49 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java @@ -0,0 +1,19 @@ +package org.thingsboard.server.service.telemetry; + +import lombok.Data; +import lombok.Getter; +import org.thingsboard.server.service.security.model.SecurityUser; + +import java.net.InetSocketAddress; +import java.util.Objects; + +/** + * Created by ashvayka on 27.03.18. + */ +@Data +public class TelemetryWebSocketTextMsg { + + private final TelemetryWebSocketSessionRef sessionRef; + private final String payload; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java b/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java new file mode 100644 index 0000000000..c0b162b93d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java @@ -0,0 +1,38 @@ +package org.thingsboard.server.service.telemetry; + +import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; + +/** + * Created by ashvayka on 27.03.18. + */ +public class WsSessionMetaData { + private TelemetryWebSocketSessionRef sessionRef; + private long lastActivityTime; + + public WsSessionMetaData(TelemetryWebSocketSessionRef sessionRef) { + super(); + this.sessionRef = sessionRef; + this.lastActivityTime = System.currentTimeMillis(); + } + + public TelemetryWebSocketSessionRef getSessionRef() { + return sessionRef; + } + + public void setSessionRef(TelemetryWebSocketSessionRef sessionRef) { + this.sessionRef = sessionRef; + } + + public long getLastActivityTime() { + return lastActivityTime; + } + + public void setLastActivityTime(long lastActivityTime) { + this.lastActivityTime = lastActivityTime; + } + + @Override + public String toString() { + return "WsSessionMetaData [sessionRef=" + sessionRef + ", lastActivityTime=" + lastActivityTime + "]"; + } +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java index 76b3e336d8..31c1cdae90 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java @@ -33,6 +33,10 @@ public class EntityIdFactory { return getByTypeAndUuid(EntityType.valueOf(type), uuid); } + public static EntityId getByTypeAndUuid(EntityType type, String uuid) { + return getByTypeAndUuid(type, UUID.fromString(uuid)); + } + public static EntityId getByTypeAndUuid(EntityType type, UUID uuid) { switch (type) { case TENANT: diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java index ec00677af5..9d9c2f322a 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java @@ -344,9 +344,7 @@ public class SubscriptionManager { } private void checkSubsciptionsPrevAddress(Set subscriptions) { - Iterator subscriptionIterator = subscriptions.iterator(); - while (subscriptionIterator.hasNext()) { - Subscription s = subscriptionIterator.next(); + for (Subscription s : subscriptions) { if (s.isLocal()) { if (s.getServer() != null) { log.trace("[{}] Local subscription is no longer handled on remote server address [{}]", s.getWsSessionId(), s.getServer()); diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java index c6e7a54da0..158945c1f8 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java @@ -243,27 +243,19 @@ public class TelemetryRpcMsgHandler implements RpcMsgHandler { switch (attr.getDataType()) { case BOOLEAN: Optional booleanValue = attr.getBooleanValue(); - if (booleanValue.isPresent()) { - dataBuilder.setBoolValue(booleanValue.get()); - } + booleanValue.ifPresent(dataBuilder::setBoolValue); break; case LONG: Optional longValue = attr.getLongValue(); - if (longValue.isPresent()) { - dataBuilder.setLongValue(longValue.get()); - } + longValue.ifPresent(dataBuilder::setLongValue); break; case DOUBLE: Optional doubleValue = attr.getDoubleValue(); - if (doubleValue.isPresent()) { - dataBuilder.setDoubleValue(doubleValue.get()); - } + doubleValue.ifPresent(dataBuilder::setDoubleValue); break; case STRING: Optional stringValue = attr.getStrValue(); - if (stringValue.isPresent()) { - dataBuilder.setStrValue(stringValue.get()); - } + stringValue.ifPresent(dataBuilder::setStrValue); break; } return dataBuilder; From 70d9d7addd9f93e7364dcf8f6bf34a7a0ffa547a Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 30 Mar 2018 18:06:59 +0300 Subject: [PATCH 45/75] RuleChain UI --- .../event/event-row-debug-rulenode.tpl.html | 2 +- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 7 ++- ui/src/app/rulechain/rulechain.scss | 54 +++++++++++++++++-- ui/src/app/rulechain/rulechain.tpl.html | 52 ++++++++++++++++-- 5 files changed, 106 insertions(+), 10 deletions(-) diff --git a/ui/src/app/event/event-row-debug-rulenode.tpl.html b/ui/src/app/event/event-row-debug-rulenode.tpl.html index ec00b39ef1..5b96bafd62 100644 --- a/ui/src/app/event/event-row-debug-rulenode.tpl.html +++ b/ui/src/app/event/event-row-debug-rulenode.tpl.html @@ -24,7 +24,7 @@

{{event.body.dataType}}
{{ 'action.view' | translate }} diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 0a17e3993a..f616fec1a0 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1187,6 +1187,7 @@ export default angular.module('thingsboard.locale', []) "rulenode": { "details": "Details", "events": "Events", + "search": "Search nodes", "add": "Add rule node", "name": "Name", "name-required": "Name is required.", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 83bca325ab..7de72c31bd 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -43,6 +43,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.editingRuleNodeLink = null; vm.isEditingRuleNodeLink = false; + vm.isLibraryOpen = true; + vm.ruleNodeSearch = ''; + vm.ruleChain = ruleChain; vm.ruleChainMetaData = ruleChainMetaData; @@ -131,11 +134,11 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } vm.onEditRuleNodeClosed = function() { - //vm.editingRuleNode = null; + vm.editingRuleNode = null; }; vm.onEditRuleNodeLinkClosed = function() { - //vm.editingRuleNodeLink = null; + vm.editingRuleNodeLink = null; }; vm.saveRuleNode = function(theForm) { diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index c9b2ced8f5..38f785a4d2 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -18,13 +18,58 @@ .tb-fullscreen-button-style { z-index: 1; } + section.tb-header-buttons.tb-library-open { + pointer-events: none; + position: absolute; + left: 0px; + top: 0px; + z-index: 1; + .md-button.tb-btn-open-library { + left: 0px; + top: 0px; + line-height: 36px; + width: 36px; + height: 36px; + margin: 4px 0 0 4px; + opacity: 0.5; + } + } .tb-rulechain-library { width: 250px; min-width: 250px; - overflow-y: auto; - overflow-x: hidden; - + z-index: 1; + md-toolbar { + min-height: 48px; + height: 48px; + .md-toolbar-tools>.md-button:last-child { + margin-right: 0px; + } + .md-toolbar-tools { + font-size: 14px; + padding: 0px 6px; + .md-button.md-icon-button { + margin: 0px; + &.tb-small { + height: 32px; + min-height: 32px; + line-height: 20px; + padding: 6px; + width: 32px; + md-icon { + line-height: 20px; + font-size: 20px; + height: 20px; + width: 20px; + min-height: 20px; + min-width: 20px; + } + } + } + } + } .tb-rulechain-library-panel-group { + overflow-y: auto; + overflow-x: hidden; .tb-panel-title { -webkit-user-select: none; -moz-user-select: none; @@ -33,7 +78,7 @@ min-width: 180px; } .fc-canvas { - background: none; + background: #f9f9f9; } md-icon.md-expansion-panel-icon { margin-right: 0px; @@ -55,6 +100,7 @@ } } .tb-rulechain-graph { + z-index: 0; overflow: auto; } } diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index b25447e175..ddc1a90b9d 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -22,8 +22,54 @@ ng-keyup="vm.keyUp($event)">
-
- +
+ + + {{ 'action.apply-changes' | translate }} + + + +
+ + +
+ + search + + {{'rulenode.search' | translate}} + + +
+ + + + +
+ + close + + {{ 'action.close' | translate }} + + + + chevron_left + + {{ 'action.close' | translate }} + + +
+ + @@ -49,7 +95,7 @@ -
+
Date: Fri, 30 Mar 2018 18:13:54 +0300 Subject: [PATCH 46/75] Implementation of Generator node and improvements --- .../actors/ruleChain/DefaultTbContext.java | 17 +++- .../actors/ruleChain/RuleNodeActor.java | 13 +++ .../RuleNodeActorMessageProcessor.java | 18 +++- .../actors/ruleChain/RuleNodeToSelfMsg.java | 37 +++++++++ .../server/common/msg/MsgType.java | 5 ++ .../rule/engine/api/NodeConfiguration.java | 4 +- .../rule/engine/api/TbContext.java | 3 + .../thingsboard/rule/engine/api/TbNode.java | 2 +- .../rule/engine/debug/TbMsgGeneratorNode.java | 83 +++++++++++++++++++ .../TbMsgGeneratorNodeConfiguration.java | 40 +++++++++ .../rule/engine/filter/TbJsFilterNode.java | 4 +- .../filter/TbJsFilterNodeConfiguration.java | 2 +- .../rule/engine/filter/TbJsSwitchNode.java | 2 +- .../filter/TbJsSwitchNodeConfiguration.java | 2 +- .../engine/filter/TbMsgTypeFilterNode.java | 3 +- .../TbMsgTypeFilterNodeConfiguration.java | 2 +- .../engine/metadata/TbEntityGetAttrNode.java | 2 +- .../engine/metadata/TbGetAttributesNode.java | 2 +- .../TbGetAttributesNodeConfiguration.java | 2 +- .../TbGetEntityAttrNodeConfiguration.java | 2 +- .../metadata/TbGetRelatedAttributeNode.java | 2 +- .../transform/TbAbstractTransformNode.java | 2 +- .../transform/TbChangeOriginatorNode.java | 2 +- .../engine/transform/TbTransformMsgNode.java | 2 +- .../engine/filter/TbJsFilterNodeTest.java | 2 +- .../engine/filter/TbJsSwitchNodeTest.java | 2 +- .../TbGetCustomerAttributeNodeTest.java | 4 +- .../transform/TbChangeOriginatorNodeTest.java | 2 +- .../transform/TbTransformMsgNodeTest.java | 2 +- 29 files changed, 237 insertions(+), 28 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfMsg.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 012a09f84e..1d45b61dc3 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -15,9 +15,12 @@ */ package org.thingsboard.server.actors.ruleChain; +import akka.actor.ActorContext; +import akka.actor.ActorRef; import org.thingsboard.rule.engine.api.ListeningExecutor; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -30,8 +33,10 @@ import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; +import scala.concurrent.duration.Duration; import java.util.Set; +import java.util.concurrent.TimeUnit; /** * Created by ashvayka on 19.03.18. @@ -61,7 +66,12 @@ class DefaultTbContext implements TbContext { @Override public void tellSelf(TbMsg msg, long delayMs) { - throw new RuntimeException("Not Implemented!"); + //TODO: add persistence layer + scheduleMsgWithDelay(new RuleNodeToSelfMsg(msg), delayMs, nodeCtx.getSelfActor()); + } + + private void scheduleMsgWithDelay(Object msg, long delayInMs, ActorRef target) { + mainCtx.getScheduler().scheduleOnce(Duration.create(delayInMs, TimeUnit.MILLISECONDS), target, msg, mainCtx.getActorSystem().dispatcher(), nodeCtx.getSelfActor()); } @Override @@ -92,6 +102,11 @@ class DefaultTbContext implements TbContext { nodeCtx.getSelfActor().tell(new RuleNodeToSelfErrorMsg(msg, th), nodeCtx.getSelfActor()); } + @Override + public RuleNodeId getSelfId() { + return nodeCtx.getSelf().getId(); + } + @Override public void tellNext(TbMsg msg, Set relationTypes) { relationTypes.forEach(type -> tellNext(msg, type)); diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java index 268c597714..f7ca0d8cc7 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java @@ -47,12 +47,25 @@ public class RuleNodeActor extends ComponentActor componentClazz = Class.forName(ruleNode.getType()); TbNode tbNode = (TbNode) (componentClazz.newInstance()); - tbNode.init(new TbNodeConfiguration(ruleNode.getConfiguration()), new TbNodeState()); + tbNode.init(defaultCtx, new TbNodeConfiguration(ruleNode.getConfiguration())); return tbNode; } - } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfMsg.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfMsg.java new file mode 100644 index 0000000000..5c5af42207 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeToSelfMsg.java @@ -0,0 +1,37 @@ +/** + * Copyright © 2016-2018 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.actors.ruleChain; + +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; + +/** + * Created by ashvayka on 19.03.18. + */ +@Data +final class RuleNodeToSelfMsg implements TbActorMsg { + + private final TbMsg msg; + + @Override + public MsgType getMsgType() { + return MsgType.RULE_TO_SELF_MSG; + } + +} diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java index 7c00ee64ab..f8f204403a 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java @@ -54,4 +54,9 @@ public enum MsgType { */ RULE_TO_SELF_ERROR_MSG, + /** + * Message that is sent by RuleActor implementation to RuleActor itself to process the message. + */ + RULE_TO_SELF_MSG, + } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java index 5e4c4b5399..25c14017e5 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java @@ -15,8 +15,8 @@ */ package org.thingsboard.rule.engine.api; -public interface NodeConfiguration { +public interface NodeConfiguration { - NodeConfiguration defaultConfiguration(); + T defaultConfiguration(); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 260a51ff17..46fa1d2087 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -15,6 +15,7 @@ */ package org.thingsboard.rule.engine.api; +import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -55,6 +56,8 @@ public interface TbContext { void tellError(TbMsg msg, Throwable th); + RuleNodeId getSelfId(); + AttributesService getAttributesService(); CustomerService getCustomerService(); diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java index 89442bb648..2555c999f2 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java @@ -24,7 +24,7 @@ import java.util.concurrent.ExecutionException; */ public interface TbNode { - void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException; + void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException; void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java new file mode 100644 index 0000000000..43851a3c86 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -0,0 +1,83 @@ +/** + * Copyright © 2016-2018 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.rule.engine.debug; + +import com.datastax.driver.core.utils.UUIDs; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.RuleNode; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.rule.engine.filter.TbJsFilterNodeConfiguration; +import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import javax.script.Bindings; + +import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "generator", + configClazz = TbMsgGeneratorNodeConfiguration.class, + nodeDescription = "Periodically generates messages", + nodeDetails = "Generates messages with configurable period. ", + inEnabled = false +) + +public class TbMsgGeneratorNode implements TbNode { + + public static final String TB_MSG_GENERATOR_NODE_MSG = "TbMsgGeneratorNodeMsg"; + + private TbMsgGeneratorNodeConfiguration config; + private long delay; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbMsgGeneratorNodeConfiguration.class); + this.delay = TimeUnit.SECONDS.toMillis(config.getPeriodInSeconds()); + ctx.tellSelf(newTickMsg(ctx), delay); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + if (msg.getType().equals(TB_MSG_GENERATOR_NODE_MSG)) { + TbMsgMetaData metaData = new TbMsgMetaData(); + if (config.getMsgMetaData() != null) { + config.getMsgMetaData().forEach(metaData::putValue); + } + ctx.tellNext(new TbMsg(UUIDs.timeBased(), config.getMsgType(), ctx.getSelfId(), metaData, config.getMsgBody().getBytes(StandardCharsets.UTF_8))); + ctx.tellSelf(newTickMsg(ctx), delay); + } + } + + private TbMsg newTickMsg(TbContext ctx) { + return new TbMsg(UUIDs.timeBased(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), new byte[]{}); + } + + @Override + public void destroy() { + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java new file mode 100644 index 0000000000..e15b13f1ca --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2018 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.rule.engine.debug; + +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import java.util.Map; + +@Data +public class TbMsgGeneratorNodeConfiguration implements NodeConfiguration { + + private int msgCount; + private int periodInSeconds; + private String msgType; + private String msgBody; + private Map msgMetaData; + + @Override + public TbMsgGeneratorNodeConfiguration defaultConfiguration() { + TbMsgGeneratorNodeConfiguration configuration = new TbMsgGeneratorNodeConfiguration(); + configuration.setMsgCount(0); + configuration.setPeriodInSeconds(1); + configuration.setMsgType("DebugMsg"); + configuration.setMsgBody("{}"); + return configuration; + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index eb8941cc8c..044a8b866d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -29,7 +29,7 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j @RuleNode( type = ComponentType.FILTER, - name = "script", relationTypes = {"True", "False", "Failure"}, + name = "script", relationTypes = {"True", "False"}, configClazz = TbJsFilterNodeConfiguration.class, nodeDescription = "Filter incoming messages using JS script", nodeDetails = "Evaluate incoming Message with configured JS condition. " + @@ -45,7 +45,7 @@ public class TbJsFilterNode implements TbNode { private NashornJsEngine jsEngine; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsFilterNodeConfiguration.class); this.jsEngine = new NashornJsEngine(config.getJsScript(), "Filter"); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java index 2d776ce3e3..9ab74e890f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeConfiguration.java @@ -19,7 +19,7 @@ import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; @Data -public class TbJsFilterNodeConfiguration implements NodeConfiguration { +public class TbJsFilterNodeConfiguration implements NodeConfiguration { private String jsScript; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 98f0ebcd76..d04b58a4d5 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -45,7 +45,7 @@ public class TbJsSwitchNode implements TbNode { private NashornJsEngine jsEngine; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsSwitchNodeConfiguration.class); this.jsEngine = new NashornJsEngine(config.getJsScript(), "Switch"); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java index 3a4856cd93..79b0912c6c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeConfiguration.java @@ -22,7 +22,7 @@ import org.thingsboard.rule.engine.api.NodeConfiguration; import java.util.Set; @Data -public class TbJsSwitchNodeConfiguration implements NodeConfiguration { +public class TbJsSwitchNodeConfiguration implements NodeConfiguration { private String jsScript; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java index 8d72a7b711..225cd99e36 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java @@ -29,6 +29,7 @@ import org.thingsboard.server.common.msg.TbMsg; type = ComponentType.FILTER, name = "message type", configClazz = TbMsgTypeFilterNodeConfiguration.class, + relationTypes = {"True", "False"}, nodeDescription = "Filter incoming messages by Message Type", nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If incoming MessageType is expected - send Message via Success chain, otherwise Failure chain is used.", @@ -39,7 +40,7 @@ public class TbMsgTypeFilterNode implements TbNode { TbMsgTypeFilterNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbMsgTypeFilterNodeConfiguration.class); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java index aafd2ed7c2..ae88aa8b07 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeConfiguration.java @@ -26,7 +26,7 @@ import java.util.List; * Created by ashvayka on 19.01.18. */ @Data -public class TbMsgTypeFilterNodeConfiguration implements NodeConfiguration { +public class TbMsgTypeFilterNodeConfiguration implements NodeConfiguration { private List messageTypes; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java index 269e40fc19..3bb1cff29a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java @@ -37,7 +37,7 @@ public abstract class TbEntityGetAttrNode implements TbNode private TbGetEntityAttrNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 4fc0f3e48f..7bf70f4ed9 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -49,7 +49,7 @@ public class TbGetAttributesNode implements TbNode { private TbGetAttributesNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbGetAttributesNodeConfiguration.class); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java index 103b4de956..6cd224722a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java @@ -25,7 +25,7 @@ import java.util.List; * Created by ashvayka on 19.01.18. */ @Data -public class TbGetAttributesNodeConfiguration implements NodeConfiguration { +public class TbGetAttributesNodeConfiguration implements NodeConfiguration { private List clientAttributeNames; private List sharedAttributeNames; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java index 51951150af..0bcefae872 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Optional; @Data -public class TbGetEntityAttrNodeConfiguration implements NodeConfiguration { +public class TbGetEntityAttrNodeConfiguration implements NodeConfiguration { private Map attrMapping; private boolean isTelemetry = false; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 4cd5cd5ba6..603746ef29 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -38,7 +38,7 @@ public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext context, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbGetRelatedAttrNodeConfiguration.class); setConfig(config); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java index 426a3276a9..d6fcc5ebe6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java @@ -32,7 +32,7 @@ public abstract class TbAbstractTransformNode implements TbNode { private TbTransformNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext context, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbTransformNodeConfiguration.class); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index 40a647a822..cf761f295f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -49,7 +49,7 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode { private TbChangeOriginatorNodeConfiguration config; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbChangeOriginatorNodeConfiguration.class); validateConfig(config); setConfig(config); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index e47ea0f8db..27e46fe091 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -38,7 +38,7 @@ public class TbTransformMsgNode extends TbAbstractTransformNode { private NashornJsEngine jsEngine; @Override - public void init(TbNodeConfiguration configuration, TbNodeState state) throws TbNodeException { + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class); this.jsEngine = new NashornJsEngine(config.getJsScript(), "Transform"); setConfig(config); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java index 4c44886db0..de9d9c4e45 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -144,7 +144,7 @@ public class TbJsFilterNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbJsFilterNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); } private void mockJsExecutor() { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index 01227f48aa..f1f2d73259 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -107,7 +107,7 @@ public class TbJsSwitchNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbJsSwitchNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); } private void mockJsExecutor() { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index ad40f03006..2218749af5 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -88,7 +88,7 @@ public class TbGetCustomerAttributeNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbGetCustomerAttributeNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); } @Test @@ -226,7 +226,7 @@ public class TbGetCustomerAttributeNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbGetCustomerAttributeNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); DeviceId deviceId = new DeviceId(UUIDs.timeBased()); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java index 190692c4e5..39e0121e53 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java @@ -119,6 +119,6 @@ public class TbChangeOriginatorNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbChangeOriginatorNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); } } \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java index c6b3441f27..6df9830bec 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -114,7 +114,7 @@ public class TbTransformMsgNodeTest { TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); node = new TbTransformMsgNode(); - node.init(nodeConfiguration, null); + node.init(null, nodeConfiguration); } private void mockJsExecutor() { From dc47727cf5e29f657fd00ec0422da5fd4799bbb6 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 30 Mar 2018 21:24:58 +0300 Subject: [PATCH 47/75] UI: Improve Rule Chain Editor --- .../RuleNodeActorMessageProcessor.java | 8 ++- .../event-header-debug-rulenode.tpl.html | 14 ++--- .../event/event-row-debug-rulenode.tpl.html | 18 +++--- ui/src/app/event/event-row.directive.js | 8 +++ ui/src/app/event/event.scss | 25 ++++++-- ui/src/app/locale/locale.constant.js | 2 + ui/src/app/rulechain/rulechain.controller.js | 57 +++++++++++++++++-- ui/src/app/rulechain/rulechain.routes.js | 2 +- ui/src/app/rulechain/rulechain.scss | 13 ++++- ui/src/app/rulechain/rulechain.tpl.html | 21 ++++--- ui/src/app/rulechain/rulenode.tpl.html | 4 +- 11 files changed, 133 insertions(+), 39 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java index a08dc3489c..93cb5fbf7f 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java @@ -69,14 +69,18 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor -
event.event-time
+
event.event-time
event.server
-
event.type
-
event.entity
+
event.type
+
event.entity
event.message-id
event.message-type
-
event.data-type
-
event.data
-
event.metadata
-
event.error
+
event.data-type
+
event.data
+
event.metadata
+
event.error
diff --git a/ui/src/app/event/event-row-debug-rulenode.tpl.html b/ui/src/app/event/event-row-debug-rulenode.tpl.html index 5b96bafd62..bb832b15d8 100644 --- a/ui/src/app/event/event-row-debug-rulenode.tpl.html +++ b/ui/src/app/event/event-row-debug-rulenode.tpl.html @@ -15,14 +15,14 @@ limitations under the License. --> -
{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}
+
{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}
{{event.body.server}}
-
{{event.body.type}}
-
{{event.body.entityName}}
-
{{event.body.msgId}}
-
{{event.body.msgType}}
-
{{event.body.dataType}}
-
+
{{event.body.type}}
+
{{event.body.entityName}}
+
{{event.body.msgId}}
+
{{event.body.msgType}}
+
{{event.body.dataType}}
+
@@ -35,7 +35,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js index 4643761b39..b808fb8fff 100644 --- a/ui/src/app/event/event-row.directive.js +++ b/ui/src/app/event/event-row.directive.js @@ -86,6 +86,14 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ }); } + scope.checkTooltip = function($event) { + var el = $event.target; + var $el = angular.element(el); + if(el.offsetWidth < el.scrollWidth && !$el.attr('title')){ + $el.attr('title', $el.text()); + } + } + $compile(element.contents())(scope); } diff --git a/ui/src/app/event/event.scss b/ui/src/app/event/event.scss index b3be35c19f..b0fc46fea5 100644 --- a/ui/src/app/event/event.scss +++ b/ui/src/app/event/event.scss @@ -24,6 +24,17 @@ md-list.tb-event-table { height: 48px; padding: 0px; overflow: hidden; + .tb-cell { + text-overflow: ellipsis; + &.tb-scroll { + white-space: nowrap; + overflow-y: hidden; + overflow-x: auto; + } + &.tb-nowrap { + white-space: nowrap; + } + } } .tb-row:hover { @@ -39,13 +50,19 @@ md-list.tb-event-table { color: rgba(0,0,0,.54); font-size: 12px; font-weight: 700; - white-space: nowrap; background: none; + white-space: nowrap; } } .tb-cell { - padding: 0 24px; + &:first-child { + padding-left: 14px; + } + &:last-child { + padding-right: 14px; + } + padding: 0 6px; margin: auto 0; color: rgba(0,0,0,.87); font-size: 13px; @@ -53,8 +70,8 @@ md-list.tb-event-table { text-align: left; overflow: hidden; .md-button { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } } diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index f616fec1a0..9c0cd12ec3 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -43,6 +43,7 @@ export default angular.module('thingsboard.locale', []) "update": "Update", "remove": "Remove", "search": "Search", + "clear-search": "Clear search", "assign": "Assign", "unassign": "Unassign", "share": "Share", @@ -1188,6 +1189,7 @@ export default angular.module('thingsboard.locale', []) "details": "Details", "events": "Events", "search": "Search nodes", + "open-node-library": "Open node library", "add": "Add rule node", "name": "Name", "name-required": "Name is required.", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 7de72c31bd..14cf7985e7 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -37,6 +37,8 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.$mdExpansionPanel = $mdExpansionPanel; vm.types = types; + vm.isFullscreen = false; + vm.editingRuleNode = null; vm.isEditingRuleNode = false; @@ -57,6 +59,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }; vm.ruleNodeTypesModel = {}; + vm.ruleNodeTypesCanvasControl = {}; vm.ruleChainLibraryLoaded = false; for (var type in types.ruleNodeType) { if (!types.ruleNodeType[type].special) { @@ -67,9 +70,12 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }, selectedObjects: [] }; + vm.ruleNodeTypesCanvasControl[type] = {}; } } + + vm.selectedObjects = []; vm.modelservice = Modelfactory(vm.ruleChainModel, vm.selectedObjects); @@ -147,6 +153,7 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, theForm.$setPristine(); vm.ruleChainModel.nodes[vm.editingRuleNodeIndex] = vm.editingRuleNode; vm.editingRuleNode = angular.copy(vm.editingRuleNode); + updateRuleNodesHighlight(); } }; @@ -313,12 +320,28 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } }; - loadRuleChainLibrary(); + loadRuleChainLibrary(ruleNodeComponents, true); + + $scope.$watch('vm.ruleNodeSearch', + function (newVal, oldVal) { + if (!angular.equals(newVal, oldVal)) { + var res = $filter('filter')(ruleNodeComponents, {name: vm.ruleNodeSearch}); + loadRuleChainLibrary(res); + } + } + ); - function loadRuleChainLibrary() { + $scope.$on('searchTextUpdated', function () { + updateRuleNodesHighlight(); + }); + + function loadRuleChainLibrary(ruleNodeComponents, loadRuleChain) { + for (var componentType in vm.ruleNodeTypesModel) { + vm.ruleNodeTypesModel[componentType].model.nodes.length = 0; + } for (var i=0;i { + for (componentType in vm.ruleNodeTypesCanvasControl) { + if (vm.ruleNodeTypesCanvasControl[componentType].adjustCanvasSize) { + vm.ruleNodeTypesCanvasControl[componentType].adjustCanvasSize(true); + } + } + }); } function prepareRuleChain() { @@ -519,6 +551,8 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.isDirty = false; + updateRuleNodesHighlight(); + $mdUtil.nextTick(() => { vm.ruleChainWatch = $scope.$watch('vm.ruleChainModel', function (newVal, oldVal) { @@ -530,6 +564,20 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }); } + function updateRuleNodesHighlight() { + for (var i=0;i + ng-keyup="vm.keyUp($event)" on-fullscreen-changed="vm.isFullscreen = expanded">
- - {{ 'action.apply-changes' | translate }} + + {{ 'rulenode.open-node-library' | translate }} @@ -43,7 +43,7 @@
search - + {{'rulenode.search' | translate}} @@ -53,15 +53,17 @@
- + close - - {{ 'action.close' | translate }} + + {{ 'action.clear-search' | translate }} chevron_left - + {{ 'action.close' | translate }} @@ -90,6 +92,7 @@ callbacks="vm.nodeLibCallbacks" node-width="170" node-height="50" + control="vm.ruleNodeTypesCanvasControl[typeId]" drop-target-id="'tb-rulchain-canvas'"> diff --git a/ui/src/app/rulechain/rulenode.tpl.html b/ui/src/app/rulechain/rulenode.tpl.html index 55ee3d3c2b..83ce988684 100644 --- a/ui/src/app/rulechain/rulenode.tpl.html +++ b/ui/src/app/rulechain/rulenode.tpl.html @@ -22,8 +22,8 @@ ng-mousedown="callbacks.mouseDown($event, node)" ng-mouseenter="callbacks.mouseEnter($event, node)" ng-mouseleave="callbacks.mouseLeave($event, node)"> -
-
+
+
{{node.icon}}
From 5e2667d3dec644d48e4fb45084b0fbf939b8fe2a Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Sun, 1 Apr 2018 00:20:05 +0300 Subject: [PATCH 48/75] Implementation of Ts Websocket Service --- .../server/actors/ActorSystemContext.java | 26 +- .../actors/ruleChain/DefaultTbContext.java | 48 ++- .../controller/HttpValidationCallback.java | 32 ++ .../controller/TelemetryController.java | 2 + .../service/security/AccessValidator.java | 18 +- .../security}/ValidationCallback.java | 29 +- .../DefaultTelemetrySubscriptionService.java | 30 +- .../DefaultTelemetryWebSocketService.java | 310 +++++++++++++++++- .../TelemetrySubscriptionService.java | 7 + .../rule/engine/api/TbContext.java | 21 +- 10 files changed, 461 insertions(+), 62 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/controller/HttpValidationCallback.java rename application/src/main/java/org/thingsboard/server/{controller => service/security}/ValidationCallback.java (59%) diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 9e02946574..3cc211c26e 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -61,12 +61,17 @@ import org.thingsboard.server.service.cluster.discovery.DiscoveryService; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import org.thingsboard.server.service.component.ComponentDiscoveryService; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Optional; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; @Slf4j @Component @@ -156,6 +161,10 @@ public class ActorSystemContext { @Getter private AuditLogService auditLogService; + @Autowired + @Getter + private TelemetrySubscriptionService tsSubService; + @Autowired @Getter @Setter @@ -224,6 +233,21 @@ public class ActorSystemContext { @Getter private final Config config; + @Getter + private ExecutorService tsCallBackExecutor; + + @PostConstruct + public void initExecutor() { + tsCallBackExecutor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (tsCallBackExecutor != null) { + tsCallBackExecutor.shutdownNow(); + } + } + public ActorSystemContext() { config = ConfigFactory.parseResources(AKKA_CONF_FILE_NAME).withFallback(ConfigFactory.load()); } @@ -345,7 +369,7 @@ public class ActorSystemContext { return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); } - public ListeningExecutor getExecutor() { + public ListeningExecutor getJsExecutor() { //TODO: take thread count from yml. return new JsExecutorService(1); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 1d45b61dc3..b3b00725d5 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,12 +15,18 @@ */ package org.thingsboard.server.actors.ruleChain; -import akka.actor.ActorContext; import akka.actor.ActorRef; +import com.google.common.base.Function; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.api.ListeningExecutor; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -35,6 +41,8 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import scala.concurrent.duration.Duration; +import javax.annotation.Nullable; +import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -43,6 +51,7 @@ import java.util.concurrent.TimeUnit; */ class DefaultTbContext implements TbContext { + private static final Function, ? extends Void> LIST_VOID_FUNCTION = v -> null; private final ActorSystemContext mainCtx; private final RuleNodeCtx nodeCtx; @@ -112,9 +121,36 @@ class DefaultTbContext implements TbContext { relationTypes.forEach(type -> tellNext(msg, type)); } + @Override + public void saveAndNotify(EntityId entityId, List ts, FutureCallback callback) { + saveAndNotify(entityId, ts, 0L, callback); + } + + @Override + public void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback) { + ListenableFuture> saveFuture = mainCtx.getTsService().save(entityId, ts, ttl); + Futures.addCallback(saveFuture, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List result) { + mainCtx.getTsSubService().onLocalTimeseriesUpdate(entityId, ts); + callback.onSuccess(null); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }, mainCtx.getTsCallBackExecutor()); + } + + @Override + public void saveAndNotify(EntityId entityId, String scope, Set attributes, FutureCallback callback) { + + } + @Override public ListeningExecutor getJsExecutor() { - return mainCtx.getExecutor(); + return mainCtx.getJsExecutor(); } @Override diff --git a/application/src/main/java/org/thingsboard/server/controller/HttpValidationCallback.java b/application/src/main/java/org/thingsboard/server/controller/HttpValidationCallback.java new file mode 100644 index 0000000000..fb1f3e7bee --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/controller/HttpValidationCallback.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2018 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.controller; + +import com.google.common.util.concurrent.FutureCallback; +import org.springframework.http.ResponseEntity; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.service.security.ValidationCallback; + +/** + * Created by ashvayka on 21.02.17. + */ +public class HttpValidationCallback extends ValidationCallback> { + + public HttpValidationCallback(DeferredResult response, FutureCallback> action) { + super(response, action); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index a2867cecdc..c2a2df841c 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -69,6 +69,7 @@ import org.thingsboard.server.service.security.model.SecurityUser; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; import javax.annotation.Nullable; +import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.util.ArrayList; import java.util.Arrays; @@ -101,6 +102,7 @@ public class TelemetryController extends BaseController { private ExecutorService executor; + @PostConstruct public void initExecutor() { executor = Executors.newSingleThreadExecutor(); } diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java index 01bd23869d..02e12fe53f 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.rule.RuleChain; -import org.thingsboard.server.controller.ValidationCallback; +import org.thingsboard.server.controller.HttpValidationCallback; import org.thingsboard.server.dao.alarm.AlarmService; import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.customer.CustomerService; @@ -91,7 +91,7 @@ public class AccessValidator { final DeferredResult response = new DeferredResult<>(); - validate(currentUser, entityId, new ValidationCallback(response, + validate(currentUser, entityId, new HttpValidationCallback(response, new FutureCallback>() { @Override public void onSuccess(@Nullable DeferredResult result) { @@ -107,7 +107,7 @@ public class AccessValidator { return response; } - public void validate(SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + public void validate(SecurityUser currentUser, EntityId entityId, FutureCallback callback) { switch (entityId.getEntityType()) { case DEVICE: validateDevice(currentUser, entityId, callback); @@ -130,7 +130,7 @@ public class AccessValidator { } } - private void validateDevice(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + private void validateDevice(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isSystemAdmin()) { callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -151,7 +151,7 @@ public class AccessValidator { } } - private void validateAsset(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + private void validateAsset(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isSystemAdmin()) { callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -173,7 +173,7 @@ public class AccessValidator { } - private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isCustomerUser()) { callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -194,7 +194,7 @@ public class AccessValidator { } } - private void validateCustomer(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + private void validateCustomer(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isSystemAdmin()) { callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -215,7 +215,7 @@ public class AccessValidator { } } - private void validateTenant(final SecurityUser currentUser, EntityId entityId, ValidationCallback callback) { + private void validateTenant(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isCustomerUser()) { callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else if (currentUser.isSystemAdmin()) { @@ -234,7 +234,7 @@ public class AccessValidator { } } - private FutureCallback getCallback(ValidationCallback callback, Function transformer) { + private FutureCallback getCallback(FutureCallback callback, Function transformer) { return new FutureCallback() { @Override public void onSuccess(@Nullable T result) { diff --git a/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java b/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java similarity index 59% rename from application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java rename to application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java index 6b2718f568..7feae03516 100644 --- a/application/src/main/java/org/thingsboard/server/controller/ValidationCallback.java +++ b/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java @@ -1,23 +1,6 @@ -/** - * Copyright © 2016-2018 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.controller; +package org.thingsboard.server.service.security; import com.google.common.util.concurrent.FutureCallback; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.async.DeferredResult; import org.thingsboard.server.actors.plugin.ValidationResult; import org.thingsboard.server.actors.plugin.ValidationResultCode; import org.thingsboard.server.extensions.api.exception.AccessDeniedException; @@ -26,14 +9,14 @@ import org.thingsboard.server.extensions.api.exception.InternalErrorException; import org.thingsboard.server.extensions.api.exception.UnauthorizedException; /** - * Created by ashvayka on 21.02.17. + * Created by ashvayka on 31.03.18. */ -public class ValidationCallback implements FutureCallback { +public class ValidationCallback implements FutureCallback { - private final DeferredResult response; - private final FutureCallback> action; + private final T response; + private final FutureCallback action; - public ValidationCallback(DeferredResult response, FutureCallback> action) { + public ValidationCallback(T response, FutureCallback action) { this.response = response; this.action = action; } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java index 359949eef9..81cdac93ed 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java @@ -5,8 +5,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.Subscription; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; import java.util.HashMap; import java.util.List; @@ -23,13 +25,10 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio @Autowired private TelemetryWebSocketService wsService; - private final Map> subscriptionsByEntityId = new HashMap<>(); private final Map> subscriptionsByWsSessionId = new HashMap<>(); - - @Override public void onAttributesUpdateFromServer(EntityId entityId, String scope, List attributes) { @@ -39,4 +38,29 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio public void onTimeseriesUpdateFromServer(EntityId entityId, List entries) { } + + @Override + public void cleanupLocalWsSessionSubscriptions(TelemetryWebSocketSessionRef sessionRef, String sessionId) { + + } + + @Override + public void removeSubscription(String sessionId, int cmdId) { + + } + + @Override + public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { + + } + + @Override + public void onLocalTimeseriesUpdate(EntityId entityId, Map> ts) { + + } + + @Override + public void onLocalAttributesUpdate(EntityId entityId, String scope, Set attributes) { + + } } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java index 6d6c33e65b..57dd93d79f 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java @@ -2,36 +2,46 @@ package org.thingsboard.server.service.telemetry; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.hazelcast.util.function.Consumer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import org.thingsboard.server.actors.plugin.ValidationResult; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.kv.Aggregation; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseTsKvQuery; import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.extensions.api.exception.UnauthorizedException; -import org.thingsboard.server.extensions.api.plugins.PluginCallback; -import org.thingsboard.server.extensions.api.plugins.PluginContext; -import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.AttributesSubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.GetHistoryCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.SubscriptionCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmdsWrapper; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TimeseriesSubscriptionCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionErrorCode; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; +import org.thingsboard.server.service.security.AccessValidator; +import javax.annotation.Nullable; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -41,6 +51,8 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.stream.Collectors; /** @@ -50,6 +62,8 @@ import java.util.stream.Collectors; @Slf4j public class DefaultTelemetryWebSocketService implements TelemetryWebSocketService { + public static final int DEFAULT_LIMIT = 100; + public static final Aggregation DEFAULT_AGGREGATION = Aggregation.NONE; private static final int UNKNOWN_SUBSCRIPTION_ID = 0; private static final String PROCESSING_MSG = "[{}] Processing: {}"; private static final ObjectMapper jsonMapper = new ObjectMapper(); @@ -65,12 +79,29 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi @Autowired private TelemetryWebSocketMsgEndpoint msgEndpoint; + @Autowired + private AccessValidator accessValidator; + @Autowired private AttributesService attributesService; @Autowired private TimeseriesService tsService; + private ExecutorService executor; + + @PostConstruct + public void initExecutor() { + executor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (executor != null) { + executor.shutdownNow(); + } + } + @Override public void handleWebSocketSessionEvent(TelemetryWebSocketSessionRef sessionRef, SessionEvent event) { String sessionId = sessionRef.getSessionId(); @@ -169,44 +200,190 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi }; if (StringUtils.isEmpty(cmd.getScope())) { - //ValidationCallback? - ctx.loadAttributes(entityId, Arrays.asList(DataConstants.allScopes()), keys, callback); + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, getAttributesFetchCallback(entityId, keys, callback)); } else { - ctx.loadAttributes(entityId, cmd.getScope(), keys, callback); + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, getAttributesFetchCallback(entityId, cmd.getScope(), keys, callback)); + } + } + + private void handleWsHistoryCmd(TelemetryWebSocketSessionRef sessionRef, GetHistoryCmd cmd) { + String sessionId = sessionRef.getSessionId(); + WsSessionMetaData sessionMD = wsSessionsMap.get(sessionId); + if (sessionMD == null) { + log.warn("[{}] Session meta data not found. ", sessionId); + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + SESSION_META_DATA_NOT_FOUND); + sendWsMsg(sessionRef, update); + return; + } + if (cmd.getEntityId() == null || cmd.getEntityId().isEmpty() || cmd.getEntityType() == null || cmd.getEntityType().isEmpty()) { + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.BAD_REQUEST, + "Device id is empty!"); + sendWsMsg(sessionRef, update); + return; + } + if (cmd.getKeys() == null || cmd.getKeys().isEmpty()) { + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.BAD_REQUEST, + "Keys are empty!"); + sendWsMsg(sessionRef, update); + return; } + EntityId entityId = EntityIdFactory.getByTypeAndId(cmd.getEntityType(), cmd.getEntityId()); + List keys = new ArrayList<>(getKeys(cmd).orElse(Collections.emptySet())); + List queries = keys.stream().map(key -> new BaseTsKvQuery(key, cmd.getStartTs(), cmd.getEndTs(), cmd.getInterval(), getLimit(cmd.getLimit()), getAggregation(cmd.getAgg()))) + .collect(Collectors.toList()); + + FutureCallback> callback = new FutureCallback>() { + @Override + public void onSuccess(List data) { + sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), data)); + } + + @Override + public void onFailure(Throwable e) { + SubscriptionUpdate update; + if (UnauthorizedException.class.isInstance(e)) { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.UNAUTHORIZED, + SubscriptionErrorCode.UNAUTHORIZED.getDefaultMsg()); + } else { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + FAILED_TO_FETCH_DATA); + } + sendWsMsg(sessionRef, update); + } + }; + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, + on(r -> Futures.addCallback(tsService.findAll(entityId, queries), callback, executor), callback::onFailure)); } - private void handleWsAttributesSubscription(PluginContext ctx, PluginWebsocketSessionRef sessionRef, + private void handleWsAttributesSubscription(TelemetryWebSocketSessionRef sessionRef, AttributesSubscriptionCmd cmd, String sessionId, EntityId entityId) { - PluginCallback> callback = new PluginCallback>() { + FutureCallback> callback = new FutureCallback>() { @Override - public void onSuccess(PluginContext ctx, List data) { + public void onSuccess(List data) { List attributesData = data.stream().map(d -> new BasicTsKvEntry(d.getLastUpdateTs(), d)).collect(Collectors.toList()); - sendWsMsg(ctx, sessionRef, new SubscriptionUpdate(cmd.getCmdId(), attributesData)); + sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), attributesData)); Map subState = new HashMap<>(attributesData.size()); attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, true, subState, cmd.getScope()); - subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); + subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); } @Override - public void onFailure(PluginContext ctx, Exception e) { + public void onFailure(Throwable e) { log.error(FAILED_TO_FETCH_ATTRIBUTES, e); SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, FAILED_TO_FETCH_ATTRIBUTES); - sendWsMsg(ctx, sessionRef, update); + sendWsMsg(sessionRef, update); } }; + if (StringUtils.isEmpty(cmd.getScope())) { - ctx.loadAttributes(entityId, Arrays.asList(DataConstants.allScopes()), callback); + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, getAttributesFetchCallback(entityId, callback)); + } else { + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, getAttributesFetchCallback(entityId, cmd.getScope(), callback)); + } + } + + private void handleWsTimeseriesSubscriptionCmd(TelemetryWebSocketSessionRef sessionRef, TimeseriesSubscriptionCmd cmd) { + String sessionId = sessionRef.getSessionId(); + log.debug("[{}] Processing: {}", sessionId, cmd); + + if (validateSessionMetadata(sessionRef, cmd, sessionId)) { + if (cmd.isUnsubscribe()) { + unsubscribe(sessionRef, cmd, sessionId); + } else if (validateSubscriptionCmd(sessionRef, cmd)) { + EntityId entityId = EntityIdFactory.getByTypeAndId(cmd.getEntityType(), cmd.getEntityId()); + Optional> keysOptional = getKeys(cmd); + + if (keysOptional.isPresent()) { + handleWsTimeseriesSubscriptionByKeys(sessionRef, cmd, sessionId, entityId); + } else { + handleWsTimeseriesSubscription(sessionRef, cmd, sessionId, entityId); + } + } + } + } + + private void handleWsTimeseriesSubscriptionByKeys(TelemetryWebSocketSessionRef sessionRef, + TimeseriesSubscriptionCmd cmd, String sessionId, EntityId entityId) { + long startTs; + if (cmd.getTimeWindow() > 0) { + List keys = new ArrayList<>(getKeys(cmd).orElse(Collections.emptySet())); + log.debug("[{}] fetching timeseries data for last {} ms for keys: ({}) for device : {}", sessionId, cmd.getTimeWindow(), cmd.getKeys(), entityId); + startTs = cmd.getStartTs(); + long endTs = cmd.getStartTs() + cmd.getTimeWindow(); + List queries = keys.stream().map(key -> new BaseTsKvQuery(key, startTs, endTs, cmd.getInterval(), + getLimit(cmd.getLimit()), getAggregation(cmd.getAgg()))).collect(Collectors.toList()); + + final FutureCallback> callback = getSubscriptionCallback(sessionRef, cmd, sessionId, entityId, startTs, keys); + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, + on(r -> Futures.addCallback(tsService.findAll(entityId, queries), callback, executor), callback::onFailure)); } else { - ctx.loadAttributes(entityId, cmd.getScope(), callback); + List keys = new ArrayList<>(getKeys(cmd).orElse(Collections.emptySet())); + startTs = System.currentTimeMillis(); + log.debug("[{}] fetching latest timeseries data for keys: ({}) for device : {}", sessionId, cmd.getKeys(), entityId); + final FutureCallback> callback = getSubscriptionCallback(sessionRef, cmd, sessionId, entityId, startTs, keys); + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, + on(r -> Futures.addCallback(tsService.findLatest(entityId, keys), callback, executor), callback::onFailure)); } } + private void handleWsTimeseriesSubscription(TelemetryWebSocketSessionRef sessionRef, + TimeseriesSubscriptionCmd cmd, String sessionId, EntityId entityId) { + FutureCallback> callback = new FutureCallback>() { + @Override + public void onSuccess(List data) { + sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), data)); + Map subState = new HashMap<>(data.size()); + data.forEach(v -> subState.put(v.getKey(), v.getTs())); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, true, subState, cmd.getScope()); + subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); + } + + @Override + public void onFailure(Throwable e) { + SubscriptionUpdate update; + if (UnauthorizedException.class.isInstance(e)) { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.UNAUTHORIZED, + SubscriptionErrorCode.UNAUTHORIZED.getDefaultMsg()); + } else { + update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + FAILED_TO_FETCH_DATA); + } + sendWsMsg(sessionRef, update); + } + }; + accessValidator.validate(sessionRef.getSecurityCtx(), entityId, + on(r -> Futures.addCallback(tsService.findAllLatest(entityId), callback, executor), callback::onFailure)); + } + + private FutureCallback> getSubscriptionCallback(final TelemetryWebSocketSessionRef sessionRef, final TimeseriesSubscriptionCmd cmd, final String sessionId, final EntityId entityId, final long startTs, final List keys) { + return new FutureCallback>() { + @Override + public void onSuccess(List data) { + sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), data)); + + Map subState = new HashMap<>(keys.size()); + keys.forEach(key -> subState.put(key, startTs)); + data.forEach(v -> subState.put(v.getKey(), v.getTs())); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, false, subState, cmd.getScope()); + subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); + } + + @Override + public void onFailure(Throwable e) { + log.error(FAILED_TO_FETCH_DATA, e); + SubscriptionUpdate update = new SubscriptionUpdate(cmd.getCmdId(), SubscriptionErrorCode.INTERNAL_ERROR, + FAILED_TO_FETCH_DATA); + sendWsMsg(sessionRef, update); + } + }; + } + private void unsubscribe(TelemetryWebSocketSessionRef sessionRef, SubscriptionCmd cmd, String sessionId) { if (cmd.getEntityId() == null || cmd.getEntityId().isEmpty()) { subscriptionManager.cleanupLocalWsSessionSubscriptions(sessionRef, sessionId); @@ -258,4 +435,105 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi } } + private ListenableFuture> mergeAllAttributesFutures(List>> futures) { + return Futures.transform(Futures.successfulAsList(futures), + (Function>, ? extends List>) input -> { + List tmp = new ArrayList<>(); + if (input != null) { + input.forEach(tmp::addAll); + } + return tmp; + }, executor); + } + + private FutureCallback getAttributesFetchCallback(final EntityId entityId, final List keys, final FutureCallback> callback) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + List>> futures = new ArrayList<>(); + for (String scope : DataConstants.allScopes()) { + futures.add(attributesService.find(entityId, scope, keys)); + } + + ListenableFuture> future = mergeAllAttributesFutures(futures); + Futures.addCallback(future, callback); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } + + private FutureCallback getAttributesFetchCallback(final EntityId entityId, final String scope, final List keys, final FutureCallback> callback) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + Futures.addCallback(attributesService.find(entityId, scope, keys), callback); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } + + private FutureCallback getAttributesFetchCallback(final EntityId entityId, final FutureCallback> callback) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + List>> futures = new ArrayList<>(); + for (String scope : DataConstants.allScopes()) { + futures.add(attributesService.findAll(entityId, scope)); + } + + ListenableFuture> future = mergeAllAttributesFutures(futures); + Futures.addCallback(future, callback); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } + + private FutureCallback getAttributesFetchCallback(final EntityId entityId, final String scope, final FutureCallback> callback) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + Futures.addCallback(attributesService.findAll(entityId, scope), callback); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }; + } + + private FutureCallback on(Consumer success, Consumer failure) { + return new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + success.accept(result); + } + + @Override + public void onFailure(Throwable t) { + failure.accept(t); + } + }; + } + + + private static Aggregation getAggregation(String agg) { + return StringUtils.isEmpty(agg) ? DEFAULT_AGGREGATION : Aggregation.valueOf(agg); + } + + private int getLimit(int limit) { + return limit == 0 ? DEFAULT_LIMIT : limit; + } } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java index 9673629e9d..44e8512559 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java @@ -2,10 +2,13 @@ package org.thingsboard.server.service.telemetry; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; import java.util.List; +import java.util.Map; +import java.util.Set; /** * Created by ashvayka on 27.03.18. @@ -21,4 +24,8 @@ public interface TelemetrySubscriptionService { void removeSubscription(String sessionId, int cmdId); void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub); + + void onLocalTimeseriesUpdate(EntityId entityId, List ts); + + void onLocalAttributesUpdate(EntityId entityId, String scope, Set attributes); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 46fa1d2087..6b8947037a 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -15,7 +15,12 @@ */ package org.thingsboard.rule.engine.api; +import com.google.common.util.concurrent.FutureCallback; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -30,6 +35,8 @@ import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; +import java.util.List; +import java.util.Map; import java.util.Set; import java.util.UUID; @@ -56,6 +63,12 @@ public interface TbContext { void tellError(TbMsg msg, Throwable th); + void saveAndNotify(EntityId entityId, List ts, FutureCallback callback); + + void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback); + + void saveAndNotify(EntityId entityId, String scope, Set attributes, FutureCallback callback); + RuleNodeId getSelfId(); AttributesService getAttributesService(); From 6d8cb480e9fed0527613ae3bf41bd933ab2adbb1 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Sun, 1 Apr 2018 20:06:41 +0300 Subject: [PATCH 49/75] Fixed compilation issues --- .../server/actors/ActorSystemContext.java | 15 - .../actors/ruleChain/DefaultTbContext.java | 42 +-- .../controller/TelemetryController.java | 28 +- .../controller/plugin/TbWebSocketHandler.java | 8 +- .../service/security/AccessValidator.java | 15 + .../service/security/ValidationCallback.java | 15 + .../DefaultTelemetrySubscriptionService.java | 293 +++++++++++++++++- .../DefaultTelemetryWebSocketService.java | 34 +- .../TelemetrySubscriptionService.java | 26 +- .../TelemetryWebSocketMsgEndpoint.java | 15 + .../telemetry/TelemetryWebSocketService.java | 18 ++ .../TelemetryWebSocketSessionRef.java | 15 + .../telemetry/TelemetryWebSocketTextMsg.java | 15 + .../service/telemetry/WsSessionMetaData.java | 15 + .../plugin/telemetry/SubscriptionManager.java | 28 +- .../cmd/AttributesSubscriptionCmd.java | 6 +- .../plugin/telemetry/cmd/SubscriptionCmd.java | 4 +- .../cmd/TimeseriesSubscriptionCmd.java | 6 +- .../handlers/TelemetryRpcMsgHandler.java | 2 +- .../handlers/TelemetryRuleMsgHandler.java | 18 +- .../TelemetryWebsocketMsgHandler.java | 33 +- .../plugin/telemetry/sub/Subscription.java | 3 +- .../telemetry/sub/SubscriptionState.java | 3 +- .../telemetry/sub/SubscriptionType.java | 23 -- .../rule/engine/api/TbContext.java | 14 +- .../transform/TbTransformMsgNodeTest.java | 2 +- 26 files changed, 532 insertions(+), 164 deletions(-) delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionType.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 3cc211c26e..21bc090c87 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -233,21 +233,6 @@ public class ActorSystemContext { @Getter private final Config config; - @Getter - private ExecutorService tsCallBackExecutor; - - @PostConstruct - public void initExecutor() { - tsCallBackExecutor = Executors.newSingleThreadExecutor(); - } - - @PreDestroy - public void shutdownExecutor() { - if (tsCallBackExecutor != null) { - tsCallBackExecutor.shutdownNow(); - } - } - public ActorSystemContext() { config = ConfigFactory.parseResources(AKKA_CONF_FILE_NAME).withFallback(ConfigFactory.load()); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index b3b00725d5..7dca2c8409 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -17,16 +17,10 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.ActorRef; import com.google.common.base.Function; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.api.ListeningExecutor; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleNodeId; -import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -41,7 +35,6 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import scala.concurrent.duration.Duration; -import javax.annotation.Nullable; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -121,33 +114,6 @@ class DefaultTbContext implements TbContext { relationTypes.forEach(type -> tellNext(msg, type)); } - @Override - public void saveAndNotify(EntityId entityId, List ts, FutureCallback callback) { - saveAndNotify(entityId, ts, 0L, callback); - } - - @Override - public void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback) { - ListenableFuture> saveFuture = mainCtx.getTsService().save(entityId, ts, ttl); - Futures.addCallback(saveFuture, new FutureCallback>() { - @Override - public void onSuccess(@Nullable List result) { - mainCtx.getTsSubService().onLocalTimeseriesUpdate(entityId, ts); - callback.onSuccess(null); - } - - @Override - public void onFailure(Throwable t) { - callback.onFailure(t); - } - }, mainCtx.getTsCallBackExecutor()); - } - - @Override - public void saveAndNotify(EntityId entityId, String scope, Set attributes, FutureCallback callback) { - - } - @Override public ListeningExecutor getJsExecutor() { return mainCtx.getJsExecutor(); diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index c2a2df841c..c1338e4c58 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -88,15 +88,15 @@ import java.util.stream.Collectors; @Slf4j public class TelemetryController extends BaseController { - @Autowired - private TelemetrySubscriptionService subscriptionService; - @Autowired private AttributesService attributesService; @Autowired private TimeseriesService tsService; + @Autowired + private TelemetrySubscriptionService tsSubService; + @Autowired private AccessValidator accessValidator; @@ -312,13 +312,11 @@ public class TelemetryController extends BaseController { } SecurityUser user = getCurrentUser(); return accessValidator.validateEntityAndCallback(getCurrentUser(), entityIdSrc, (result, entityId) -> { - ListenableFuture> future = attributesService.save(entityId, scope, attributes); - Futures.addCallback(future, new FutureCallback>() { + tsSubService.saveAndNotify(entityId, scope, attributes, new FutureCallback() { @Override - public void onSuccess(@Nullable List tmp) { + public void onSuccess(@Nullable Void tmp) { logAttributesUpdated(user, entityId, scope, attributes, null); result.setResult(new ResponseEntity(HttpStatus.OK)); - subscriptionService.onAttributesUpdateFromServer(entityId, scope, attributes); } @Override @@ -327,7 +325,6 @@ public class TelemetryController extends BaseController { AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR); } }); - result.setResult(new ResponseEntity(HttpStatus.OK)); }); } else { return getImmediateDeferredResult("Request is not a JSON object", HttpStatus.BAD_REQUEST); @@ -358,12 +355,10 @@ public class TelemetryController extends BaseController { } SecurityUser user = getCurrentUser(); return accessValidator.validateEntityAndCallback(getCurrentUser(), entityIdSrc, (result, entityId) -> { - ListenableFuture> future = tsService.save(entityId, entries, ttl); - Futures.addCallback(future, new FutureCallback>() { + tsSubService.saveAndNotify(entityId, entries, ttl, new FutureCallback() { @Override - public void onSuccess(@Nullable List tmp) { + public void onSuccess(@Nullable Void tmp) { result.setResult(new ResponseEntity(HttpStatus.OK)); - subscriptionService.onTimeseriesUpdateFromServer(entityId, entries); } @Override @@ -371,7 +366,6 @@ public class TelemetryController extends BaseController { AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR); } }); - result.setResult(new ResponseEntity(HttpStatus.OK)); }); } diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java index 800bc3bbf9..ba5f9f96fc 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java index 02e12fe53f..e9bacfdcff 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.security; import com.google.common.base.Function; diff --git a/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java b/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java index 7feae03516..2b91c60a3e 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java +++ b/application/src/main/java/org/thingsboard/server/service/security/ValidationCallback.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.security; import com.google.common.util.concurrent.FutureCallback; diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java index 81cdac93ed..58bbec550e 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java @@ -1,19 +1,55 @@ +/** + * Copyright © 2016-2018 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.telemetry; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.Subscription; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; +import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; +import javax.annotation.Nullable; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; /** * Created by ashvayka on 27.03.18. @@ -25,42 +61,275 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio @Autowired private TelemetryWebSocketService wsService; + @Autowired + private AttributesService attrService; + + @Autowired + private TimeseriesService tsService; + + @Autowired + private ClusterRoutingService routingService; + + private ExecutorService tsCallBackExecutor; + private ExecutorService wsCallBackExecutor; + + @PostConstruct + public void initExecutor() { + tsCallBackExecutor = Executors.newSingleThreadExecutor(); + wsCallBackExecutor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (tsCallBackExecutor != null) { + tsCallBackExecutor.shutdownNow(); + } + if (wsCallBackExecutor != null) { + wsCallBackExecutor.shutdownNow(); + } + } + private final Map> subscriptionsByEntityId = new HashMap<>(); private final Map> subscriptionsByWsSessionId = new HashMap<>(); @Override - public void onAttributesUpdateFromServer(EntityId entityId, String scope, List attributes) { - + public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { + Optional server = routingService.resolveById(entityId); + Subscription subscription; + if (server.isPresent()) { + ServerAddress address = server.get(); + log.trace("[{}] Forwarding subscription [{}] for device [{}] to [{}]", sessionId, sub.getSubscriptionId(), entityId, address); + subscription = new Subscription(sub, true, address); +// rpcHandler.onNewSubscription(ctx, address, sessionId, subscription); + } else { + log.trace("[{}] Registering local subscription [{}] for device [{}]", sessionId, sub.getSubscriptionId(), entityId); + subscription = new Subscription(sub, true); + } + registerSubscription(sessionId, entityId, subscription); } @Override - public void onTimeseriesUpdateFromServer(EntityId entityId, List entries) { + public void cleanupLocalWsSessionSubscriptions(TelemetryWebSocketSessionRef sessionRef, String sessionId) { + cleanupLocalWsSessionSubscriptions(sessionId); + } + @Override + public void removeSubscription(String sessionId, int subscriptionId) { + log.debug("[{}][{}] Going to remove subscription.", sessionId, subscriptionId); + Map sessionSubscriptions = subscriptionsByWsSessionId.get(sessionId); + if (sessionSubscriptions != null) { + Subscription subscription = sessionSubscriptions.remove(subscriptionId); + if (subscription != null) { + processSubscriptionRemoval(sessionId, sessionSubscriptions, subscription); + } else { + log.debug("[{}][{}] Subscription not found!", sessionId, subscriptionId); + } + } else { + log.debug("[{}] No session subscriptions found!", sessionId); + } } @Override - public void cleanupLocalWsSessionSubscriptions(TelemetryWebSocketSessionRef sessionRef, String sessionId) { + public void saveAndNotify(EntityId entityId, List ts, FutureCallback callback) { + saveAndNotify(entityId, ts, 0L, callback); + } + @Override + public void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback) { + ListenableFuture> saveFuture = tsService.save(entityId, ts, ttl); + addMainCallback(saveFuture, callback); + addWsCallback(saveFuture, success -> onTimeseriesUpdate(entityId, ts)); } @Override - public void removeSubscription(String sessionId, int cmdId) { + public void saveAndNotify(EntityId entityId, String scope, List attributes, FutureCallback callback) { + ListenableFuture> saveFuture = attrService.save(entityId, scope, attributes); + addMainCallback(saveFuture, callback); + addWsCallback(saveFuture, success -> onAttributesUpdate(entityId, scope, attributes)); + } + private void onAttributesUpdate(EntityId entityId, String scope, List attributes) { + Optional serverAddress = routingService.resolveById(entityId); + if (!serverAddress.isPresent()) { + onLocalAttributesUpdate(entityId, scope, attributes); + } else { +// rpcHandler.onAttributesUpdate(ctx, serverAddress.get(), entityId, entries); + } } - @Override - public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { + private void onTimeseriesUpdate(EntityId entityId, List ts) { + Optional serverAddress = routingService.resolveById(entityId); + if (!serverAddress.isPresent()) { + onLocalTimeseriesUpdate(entityId, ts); + } else { +// rpcHandler.onTimeseriesUpdate(ctx, serverAddress.get(), entityId, entries); + } + } + private void onLocalAttributesUpdate(EntityId entityId, String scope, List attributes) { + onLocalSubUpdate(entityId, s -> TelemetryFeature.ATTRIBUTES == s.getType() && (StringUtils.isEmpty(s.getScope()) || scope.equals(s.getScope())), s -> { + List subscriptionUpdate = null; + for (AttributeKvEntry kv : attributes) { + if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) { + if (subscriptionUpdate == null) { + subscriptionUpdate = new ArrayList<>(); + } + subscriptionUpdate.add(new BasicTsKvEntry(kv.getLastUpdateTs(), kv)); + } + } + return subscriptionUpdate; + }); } - @Override - public void onLocalTimeseriesUpdate(EntityId entityId, Map> ts) { + private void onLocalTimeseriesUpdate(EntityId entityId, List ts) { + onLocalSubUpdate(entityId, s -> TelemetryFeature.TIMESERIES == s.getType(), s -> { + List subscriptionUpdate = null; + for (TsKvEntry kv : ts) { + if (s.isAllKeys() || s.getKeyStates().containsKey((kv.getKey()))) { + if (subscriptionUpdate == null) { + subscriptionUpdate = new ArrayList<>(); + } + subscriptionUpdate.add(kv); + } + } + return subscriptionUpdate; + }); + } + private void onLocalSubUpdate(EntityId entityId, Predicate filter, Function> f) { + Set deviceSubscriptions = subscriptionsByEntityId.get(entityId); + if (deviceSubscriptions != null) { + deviceSubscriptions.stream().filter(filter).forEach(s -> { + String sessionId = s.getWsSessionId(); + List subscriptionUpdate = f.apply(s); + if (subscriptionUpdate == null || !subscriptionUpdate.isEmpty()) { + SubscriptionUpdate update = new SubscriptionUpdate(s.getSubscriptionId(), subscriptionUpdate); + if (s.isLocal()) { + updateSubscriptionState(sessionId, s, update); + wsService.sendWsMsg(sessionId, update); + } else { + //TODO: ashvayka +// rpcHandler.onSubscriptionUpdate(ctx, s.getServer(), sessionId, update); + } + } + }); + } else { + log.debug("[{}] No device subscriptions to process!", entityId); + } } - @Override - public void onLocalAttributesUpdate(EntityId entityId, String scope, Set attributes) { + private void updateSubscriptionState(String sessionId, Subscription subState, SubscriptionUpdate update) { + log.trace("[{}] updating subscription state {} using onUpdate {}", sessionId, subState, update); + update.getLatestValues().entrySet().forEach(e -> subState.setKeyState(e.getKey(), e.getValue())); + } + + private void registerSubscription(String sessionId, EntityId entityId, Subscription subscription) { + Set deviceSubscriptions = subscriptionsByEntityId.computeIfAbsent(entityId, k -> new HashSet<>()); + deviceSubscriptions.add(subscription); + Map sessionSubscriptions = subscriptionsByWsSessionId.computeIfAbsent(sessionId, k -> new HashMap<>()); + sessionSubscriptions.put(subscription.getSubscriptionId(), subscription); + } + + public void cleanupLocalWsSessionSubscriptions(String sessionId) { + cleanupWsSessionSubscriptions(sessionId, true); + } + + public void cleanupRemoteWsSessionSubscriptions(String sessionId) { + cleanupWsSessionSubscriptions(sessionId, false); + } + + private void cleanupWsSessionSubscriptions(String sessionId, boolean localSession) { + log.debug("[{}] Removing all subscriptions for particular session.", sessionId); + Map sessionSubscriptions = subscriptionsByWsSessionId.get(sessionId); + if (sessionSubscriptions != null) { + int sessionSubscriptionSize = sessionSubscriptions.size(); + + for (Subscription subscription : sessionSubscriptions.values()) { + EntityId entityId = subscription.getEntityId(); + Set deviceSubscriptions = subscriptionsByEntityId.get(entityId); + deviceSubscriptions.remove(subscription); + if (deviceSubscriptions.isEmpty()) { + subscriptionsByEntityId.remove(entityId); + } + } + subscriptionsByWsSessionId.remove(sessionId); + log.debug("[{}] Removed {} subscriptions for particular session.", sessionId, sessionSubscriptionSize); + + if (localSession) { + notifyWsSubscriptionClosed(sessionId, sessionSubscriptions); + } + } else { + log.debug("[{}] No subscriptions found!", sessionId); + } + } + + private void notifyWsSubscriptionClosed(String sessionId, Map sessionSubscriptions) { + Set affectedServers = new HashSet<>(); + for (Subscription subscription : sessionSubscriptions.values()) { + if (subscription.getServer() != null) { + affectedServers.add(subscription.getServer()); + } + } + for (ServerAddress address : affectedServers) { + log.debug("[{}] Going to onSubscriptionUpdate [{}] server about session close event", sessionId, address); +// rpcHandler.onSessionClose(ctx, address, sessionId); + } + } + + private void processSubscriptionRemoval(String sessionId, Map sessionSubscriptions, Subscription subscription) { + EntityId entityId = subscription.getEntityId(); + if (subscription.isLocal() && subscription.getServer() != null) { +// rpcHandler.onSubscriptionClose(ctx, subscription.getServer(), sessionId, subscription.getSubscriptionId()); + } + if (sessionSubscriptions.isEmpty()) { + log.debug("[{}] Removed last subscription for particular session.", sessionId); + subscriptionsByWsSessionId.remove(sessionId); + } else { + log.debug("[{}] Removed session subscription.", sessionId); + } + Set deviceSubscriptions = subscriptionsByEntityId.get(entityId); + if (deviceSubscriptions != null) { + boolean result = deviceSubscriptions.remove(subscription); + if (result) { + if (deviceSubscriptions.size() == 0) { + log.debug("[{}] Removed last subscription for particular device.", sessionId); + subscriptionsByEntityId.remove(entityId); + } else { + log.debug("[{}] Removed device subscription.", sessionId); + } + } else { + log.debug("[{}] Subscription not found!", sessionId); + } + } else { + log.debug("[{}] No device subscriptions found!", sessionId); + } + } + + private void addMainCallback(ListenableFuture> saveFuture, final FutureCallback callback) { + Futures.addCallback(saveFuture, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List result) { + callback.onSuccess(null); + } + + @Override + public void onFailure(Throwable t) { + callback.onFailure(t); + } + }, tsCallBackExecutor); + } + + private void addWsCallback(ListenableFuture> saveFuture, Consumer callback) { + Futures.addCallback(saveFuture, new FutureCallback>() { + @Override + public void onSuccess(@Nullable List result) { + callback.accept(null); + } + @Override + public void onFailure(Throwable t) { + } + }, wsCallBackExecutor); } } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java index 57dd93d79f..57f3876366 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.telemetry; import com.fasterxml.jackson.core.JsonProcessingException; @@ -24,6 +39,7 @@ import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.extensions.api.exception.UnauthorizedException; +import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.AttributesSubscriptionCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.GetHistoryCmd; @@ -31,9 +47,9 @@ import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.SubscriptionC import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmdsWrapper; import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TimeseriesSubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionErrorCode; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; import org.thingsboard.server.service.security.AccessValidator; @@ -146,6 +162,14 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi } } + @Override + public void sendWsMsg(String sessionId, SubscriptionUpdate update) { + WsSessionMetaData md = wsSessionsMap.get(sessionId); + if (md != null) { + sendWsMsg(md.getSessionRef(), update); + } + } + private void handleWsAttributesSubscriptionCmd(TelemetryWebSocketSessionRef sessionRef, AttributesSubscriptionCmd cmd) { String sessionId = sessionRef.getSessionId(); log.debug("[{}] Processing: {}", sessionId, cmd); @@ -180,7 +204,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi keys.forEach(key -> subState.put(key, 0L)); attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, false, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.ATTRIBUTES, false, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); } @@ -267,7 +291,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi Map subState = new HashMap<>(attributesData.size()); attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, true, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.ATTRIBUTES, true, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); } @@ -340,7 +364,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi sendWsMsg(sessionRef, new SubscriptionUpdate(cmd.getCmdId(), data)); Map subState = new HashMap<>(data.size()); data.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, true, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.TIMESERIES, true, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); } @@ -370,7 +394,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi Map subState = new HashMap<>(keys.size()); keys.forEach(key -> subState.put(key, startTs)); data.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, false, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.TIMESERIES, false, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(sessionId, entityId, sub); } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java index 44e8512559..7bf223f83f 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java @@ -1,5 +1,21 @@ +/** + * Copyright © 2016-2018 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.telemetry; +import com.google.common.util.concurrent.FutureCallback; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; @@ -15,17 +31,15 @@ import java.util.Set; */ public interface TelemetrySubscriptionService { - void onAttributesUpdateFromServer(EntityId entityId, String scope, List attributes); - - void onTimeseriesUpdateFromServer(EntityId entityId, List entries); + void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub); void cleanupLocalWsSessionSubscriptions(TelemetryWebSocketSessionRef sessionRef, String sessionId); void removeSubscription(String sessionId, int cmdId); - void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub); + void saveAndNotify(EntityId entityId, List ts, FutureCallback callback); - void onLocalTimeseriesUpdate(EntityId entityId, List ts); + void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback); - void onLocalAttributesUpdate(EntityId entityId, String scope, Set attributes); + void saveAndNotify(EntityId entityId, String scope, List attributes, FutureCallback callback); } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java index a7e7cad1c3..00fb80a522 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketMsgEndpoint.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.telemetry; import java.io.IOException; diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java index 883a174eed..be6fc56b3a 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketService.java @@ -1,6 +1,22 @@ +/** + * Copyright © 2016-2018 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.telemetry; import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent; +import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; /** * Created by ashvayka on 27.03.18. @@ -10,4 +26,6 @@ public interface TelemetryWebSocketService { void handleWebSocketSessionEvent(TelemetryWebSocketSessionRef sessionRef, SessionEvent sessionEvent); void handleWebSocketMsg(TelemetryWebSocketSessionRef sessionRef, String msg); + + void sendWsMsg(String sessionId, SubscriptionUpdate update); } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java index 3fd4b19fb3..53438c533b 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketSessionRef.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.telemetry; import lombok.Getter; diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java index 6d57122a49..5d4630cb21 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetryWebSocketTextMsg.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.telemetry; import lombok.Data; diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java b/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java index c0b162b93d..dd15ed33bd 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/WsSessionMetaData.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.telemetry; import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java index 9d9c2f322a..0c3b174c45 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java @@ -19,20 +19,30 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.DataConstants; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.kv.*; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseTsKvQuery; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.extensions.api.plugins.PluginCallback; import org.thingsboard.server.extensions.api.plugins.PluginContext; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryRpcMsgHandler; import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryWebsocketMsgHandler; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.Subscription; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; @@ -70,7 +80,7 @@ public class SubscriptionManager { EntityId entityId = subscription.getEntityId(); log.trace("[{}] Registering remote subscription [{}] for device [{}] to [{}]", sessionId, subscription.getSubscriptionId(), entityId, address); registerSubscription(sessionId, entityId, subscription); - if (subscription.getType() == SubscriptionType.ATTRIBUTES) { + if (subscription.getType() == TelemetryFeature.ATTRIBUTES) { final Map keyStates = subscription.getKeyStates(); ctx.loadAttributes(entityId, DataConstants.CLIENT_SCOPE, keyStates.keySet(), new PluginCallback>() { @Override @@ -91,7 +101,7 @@ public class SubscriptionManager { log.error("Failed to fetch missed updates.", e); } }); - } else if (subscription.getType() == SubscriptionType.TIMESERIES) { + } else if (subscription.getType() == TelemetryFeature.TIMESERIES) { long curTs = System.currentTimeMillis(); List queries = new ArrayList<>(); subscription.getKeyStates().entrySet().forEach(e -> { @@ -175,7 +185,7 @@ public class SubscriptionManager { } } - public void onLocalSubscriptionUpdate(PluginContext ctx, EntityId entityId, SubscriptionType type, Function> f) { + public void onLocalSubscriptionUpdate(PluginContext ctx, EntityId entityId, TelemetryFeature type, Function> f) { onLocalSubscriptionUpdate(ctx, entityId, s -> type == s.getType(), f); } @@ -212,7 +222,7 @@ public class SubscriptionManager { public void onAttributesUpdateFromServer(PluginContext ctx, EntityId entityId, String scope, List attributes) { Optional serverAddress = ctx.resolve(entityId); if (!serverAddress.isPresent()) { - onLocalSubscriptionUpdate(ctx, entityId, s -> SubscriptionType.ATTRIBUTES == s.getType() && (StringUtils.isEmpty(s.getScope()) || scope.equals(s.getScope())), s -> { + onLocalSubscriptionUpdate(ctx, entityId, s -> TelemetryFeature.ATTRIBUTES == s.getType() && (StringUtils.isEmpty(s.getScope()) || scope.equals(s.getScope())), s -> { List subscriptionUpdate = new ArrayList(); for (AttributeKvEntry kv : attributes) { if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) { @@ -229,7 +239,7 @@ public class SubscriptionManager { public void onTimeseriesUpdateFromServer(PluginContext ctx, EntityId entityId, List entries) { Optional serverAddress = ctx.resolve(entityId); if (!serverAddress.isPresent()) { - onLocalSubscriptionUpdate(ctx, entityId, SubscriptionType.TIMESERIES, s -> { + onLocalSubscriptionUpdate(ctx, entityId, TelemetryFeature.TIMESERIES, s -> { List subscriptionUpdate = new ArrayList(); for (TsKvEntry kv : entries) { if (s.isAllKeys() || s.getKeyStates().containsKey((kv.getKey()))) { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/AttributesSubscriptionCmd.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/AttributesSubscriptionCmd.java index d116b2e46c..f30f1a5978 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/AttributesSubscriptionCmd.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/AttributesSubscriptionCmd.java @@ -16,7 +16,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry.cmd; import lombok.NoArgsConstructor; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; /** * @author Andrew Shvayka @@ -25,8 +25,8 @@ import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionT public class AttributesSubscriptionCmd extends SubscriptionCmd { @Override - public SubscriptionType getType() { - return SubscriptionType.ATTRIBUTES; + public TelemetryFeature getType() { + return TelemetryFeature.ATTRIBUTES; } } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/SubscriptionCmd.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/SubscriptionCmd.java index b06476ab9d..7f78abd77d 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/SubscriptionCmd.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/SubscriptionCmd.java @@ -18,7 +18,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry.cmd; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; @NoArgsConstructor @AllArgsConstructor @@ -32,7 +32,7 @@ public abstract class SubscriptionCmd implements TelemetryPluginCmd { private String scope; private boolean unsubscribe; - public abstract SubscriptionType getType(); + public abstract TelemetryFeature getType(); @Override public String toString() { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/TimeseriesSubscriptionCmd.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/TimeseriesSubscriptionCmd.java index 4d64ca70d4..88ecb2d9bb 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/TimeseriesSubscriptionCmd.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/cmd/TimeseriesSubscriptionCmd.java @@ -18,7 +18,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry.cmd; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; /** * @author Andrew Shvayka @@ -35,7 +35,7 @@ public class TimeseriesSubscriptionCmd extends SubscriptionCmd { private String agg; @Override - public SubscriptionType getType() { - return SubscriptionType.TIMESERIES; + public TelemetryFeature getType() { + return TelemetryFeature.TIMESERIES; } } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java index 158945c1f8..1acc29db05 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRpcMsgHandler.java @@ -114,7 +114,7 @@ public class TelemetryRpcMsgHandler implements RpcMsgHandler { } Map statesMap = proto.getKeyStatesList().stream().collect(Collectors.toMap(SubscriptionKetStateProto::getKey, SubscriptionKetStateProto::getTs)); Subscription subscription = new Subscription( - new SubscriptionState(proto.getSessionId(), proto.getSubscriptionId(), EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()), SubscriptionType.valueOf(proto.getType()), proto.getAllKeys(), statesMap, proto.getScope()), + new SubscriptionState(proto.getSessionId(), proto.getSubscriptionId(), EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()), TelemetryFeature.valueOf(proto.getType()), proto.getAllKeys(), statesMap, proto.getScope()), false, msg.getServerAddress()); subscriptionManager.addRemoteWsSubscription(ctx, msg.getServerAddress(), proto.getSessionId(), subscription); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java index 4fdfe4ab59..9cb67fdffa 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java @@ -24,7 +24,11 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; -import org.thingsboard.server.common.msg.core.*; +import org.thingsboard.server.common.msg.core.BasicGetAttributesResponse; +import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; +import org.thingsboard.server.common.msg.core.GetAttributesRequest; +import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; import org.thingsboard.server.common.msg.kv.BasicAttributeKVMsg; import org.thingsboard.server.extensions.api.plugins.PluginCallback; import org.thingsboard.server.extensions.api.plugins.PluginContext; @@ -35,9 +39,13 @@ import org.thingsboard.server.extensions.api.plugins.msg.TelemetryUploadRequestR import org.thingsboard.server.extensions.api.plugins.msg.UpdateAttributesRequestRuleToPluginMsg; import org.thingsboard.server.extensions.core.plugin.telemetry.SubscriptionManager; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.Subscription; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; @Slf4j @@ -97,7 +105,7 @@ public class TelemetryRuleMsgHandler extends DefaultRuleMsgHandler { @Override public void onSuccess(PluginContext ctx, Void data) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, BasicStatusCodeResponse.onSuccess(request.getMsgType(), request.getRequestId()))); - subscriptionManager.onLocalSubscriptionUpdate(ctx, msg.getDeviceId(), SubscriptionType.TIMESERIES, s -> + subscriptionManager.onLocalSubscriptionUpdate(ctx, msg.getDeviceId(), TelemetryFeature.TIMESERIES, s -> prepareSubscriptionUpdate(request, s) ); } @@ -131,7 +139,7 @@ public class TelemetryRuleMsgHandler extends DefaultRuleMsgHandler { public void onSuccess(PluginContext ctx, Void value) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, BasicStatusCodeResponse.onSuccess(request.getMsgType(), request.getRequestId()))); - subscriptionManager.onLocalSubscriptionUpdate(ctx, msg.getDeviceId(), SubscriptionType.ATTRIBUTES, s -> { + subscriptionManager.onLocalSubscriptionUpdate(ctx, msg.getDeviceId(), TelemetryFeature.ATTRIBUTES, s -> { List subscriptionUpdate = new ArrayList<>(); for (AttributeKvEntry kv : request.getAttributes()) { if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryWebsocketMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryWebsocketMsgHandler.java index 1374ef68ac..8c80e78b8b 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryWebsocketMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryWebsocketMsgHandler.java @@ -21,7 +21,12 @@ import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; -import org.thingsboard.server.common.data.kv.*; +import org.thingsboard.server.common.data.kv.Aggregation; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BaseTsKvQuery; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.extensions.api.exception.UnauthorizedException; import org.thingsboard.server.extensions.api.plugins.PluginCallback; import org.thingsboard.server.extensions.api.plugins.PluginContext; @@ -32,14 +37,26 @@ import org.thingsboard.server.extensions.api.plugins.ws.msg.BinaryPluginWebSocke import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; import org.thingsboard.server.extensions.api.plugins.ws.msg.TextPluginWebSocketMsg; import org.thingsboard.server.extensions.core.plugin.telemetry.SubscriptionManager; -import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.*; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.AttributesSubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.GetHistoryCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.SubscriptionCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmd; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TelemetryPluginCmdsWrapper; +import org.thingsboard.server.extensions.core.plugin.telemetry.cmd.TimeseriesSubscriptionCmd; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionErrorCode; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; -import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionType; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionUpdate; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; /** @@ -131,7 +148,7 @@ public class TelemetryWebsocketMsgHandler extends DefaultWebsocketMsgHandler { keys.forEach(key -> subState.put(key, 0L)); attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, false, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.ATTRIBUTES, false, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); } @@ -168,7 +185,7 @@ public class TelemetryWebsocketMsgHandler extends DefaultWebsocketMsgHandler { Map subState = new HashMap<>(attributesData.size()); attributesData.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.ATTRIBUTES, true, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.ATTRIBUTES, true, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); } @@ -234,7 +251,7 @@ public class TelemetryWebsocketMsgHandler extends DefaultWebsocketMsgHandler { sendWsMsg(ctx, sessionRef, new SubscriptionUpdate(cmd.getCmdId(), data)); Map subState = new HashMap<>(data.size()); data.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, true, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.TIMESERIES, true, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); } @@ -262,7 +279,7 @@ public class TelemetryWebsocketMsgHandler extends DefaultWebsocketMsgHandler { Map subState = new HashMap<>(keys.size()); keys.forEach(key -> subState.put(key, startTs)); data.forEach(v -> subState.put(v.getKey(), v.getTs())); - SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, SubscriptionType.TIMESERIES, false, subState, cmd.getScope()); + SubscriptionState sub = new SubscriptionState(sessionId, cmd.getCmdId(), entityId, TelemetryFeature.TIMESERIES, false, subState, cmd.getScope()); subscriptionManager.addLocalWsSubscription(ctx, sessionId, entityId, sub); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/Subscription.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/Subscription.java index fc047130b8..98c7632893 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/Subscription.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/Subscription.java @@ -20,6 +20,7 @@ import lombok.Data; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; import java.util.Map; @@ -47,7 +48,7 @@ public class Subscription { return getSub().getEntityId(); } - public SubscriptionType getType() { + public TelemetryFeature getType() { return getSub().getType(); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionState.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionState.java index c9598efbd9..e4a0d260b1 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionState.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionState.java @@ -18,6 +18,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry.sub; import lombok.AllArgsConstructor; import lombok.Getter; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.extensions.core.plugin.telemetry.handlers.TelemetryFeature; import java.util.Map; @@ -30,7 +31,7 @@ public class SubscriptionState { @Getter private final String wsSessionId; @Getter private final int subscriptionId; @Getter private final EntityId entityId; - @Getter private final SubscriptionType type; + @Getter private final TelemetryFeature type; @Getter private final boolean allKeys; @Getter private final Map keyStates; @Getter private final String scope; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionType.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionType.java deleted file mode 100644 index 4a3b1e3447..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/sub/SubscriptionType.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2018 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.extensions.core.plugin.telemetry.sub; - -/** - * @author Andrew Shvayka - */ -public enum SubscriptionType { - ATTRIBUTES, TIMESERIES -} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 6b8947037a..44bd3f56c9 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. @@ -63,12 +63,6 @@ public interface TbContext { void tellError(TbMsg msg, Throwable th); - void saveAndNotify(EntityId entityId, List ts, FutureCallback callback); - - void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback); - - void saveAndNotify(EntityId entityId, String scope, Set attributes, FutureCallback callback); - RuleNodeId getSelfId(); AttributesService getAttributesService(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java index 6df9830bec..46be7f8cb4 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -89,7 +89,7 @@ public class TbTransformMsgNodeTest { @Test public void payloadCanBeUpdated() throws TbNodeException { - initWithScript("return msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine' "); + initWithScript("msg.passed = msg.passed * metadata.temp; return msg.bigObj.newProp = 'Ukraine' "); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); From 9c0f6e99253d61c1687dd68c790cea6520d80806 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 2 Apr 2018 15:45:48 +0300 Subject: [PATCH 50/75] RuleChain Import/Export --- ui/src/app/api/rule-chain.service.js | 17 +- .../import-export/import-export.service.js | 80 +++-- ui/src/app/locale/locale.constant.js | 5 +- ui/src/app/rulechain/rulechain.controller.js | 288 +++++++++++++----- ui/src/app/rulechain/rulechain.routes.js | 41 +++ ui/src/app/rulechain/rulechain.scss | 17 +- ui/src/app/rulechain/rulechain.tpl.html | 4 +- ui/src/app/rulechain/rulechains.controller.js | 4 +- ui/src/app/rulechain/rulenode.tpl.html | 4 +- 9 files changed, 346 insertions(+), 114 deletions(-) diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index af14a3f582..b930cf18fa 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -253,7 +253,7 @@ function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, co if (ruleChainConnections && ruleChainConnections.length) { var tasks = []; for (var i = 0; i < ruleChainConnections.length; i++) { - tasks.push(getRuleChain(ruleChainConnections[i].targetRuleChainId.id)); + tasks.push(resolveRuleChain(ruleChainConnections[i].targetRuleChainId.id)); } $q.all(tasks).then( (ruleChains) => { @@ -273,6 +273,21 @@ function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, co return deferred.promise; } + function resolveRuleChain(ruleChainId) { + var deferred = $q.defer(); + getRuleChain(ruleChainId, {ignoreErrors: true}).then( + (ruleChain) => { + deferred.resolve(ruleChain); + }, + () => { + deferred.resolve({ + id: {id: ruleChainId, entityType: types.entityType.rulechain} + }); + } + ); + return deferred.promise; + } + function loadRuleNodeComponents() { return componentDescriptorService.getComponentDescriptorsByTypes(types.ruleNodeTypeComponentTypes); } diff --git a/ui/src/app/import-export/import-export.service.js b/ui/src/app/import-export/import-export.service.js index 19c249f869..88c6353401 100644 --- a/ui/src/app/import-export/import-export.service.js +++ b/ui/src/app/import-export/import-export.service.js @@ -281,39 +281,63 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document, function exportRuleChain(ruleChainId) { ruleChainService.getRuleChain(ruleChainId).then( - function success(ruleChain) { - var name = ruleChain.name; - name = name.toLowerCase().replace(/\W/g,"_"); - exportToPc(prepareExport(ruleChain), name + '.json'); - //TODO: metadata + (ruleChain) => { + ruleChainService.getRuleChainMetaData(ruleChainId).then( + (ruleChainMetaData) => { + var ruleChainExport = { + ruleChain: prepareRuleChain(ruleChain), + metadata: prepareRuleChainMetaData(ruleChainMetaData) + }; + var name = ruleChain.name; + name = name.toLowerCase().replace(/\W/g,"_"); + exportToPc(ruleChainExport, name + '.json'); + }, + (rejection) => { + processExportRuleChainRejection(rejection); + } + ); }, - function fail(rejection) { - var message = rejection; - if (!message) { - message = $translate.instant('error.unknown-error'); - } - toast.showError($translate.instant('rulechain.export-failed-error', {error: message})); + (rejection) => { + processExportRuleChainRejection(rejection); } ); } + function prepareRuleChain(ruleChain) { + ruleChain = prepareExport(ruleChain); + if (ruleChain.firstRuleNodeId) { + ruleChain.firstRuleNodeId = null; + } + ruleChain.root = false; + return ruleChain; + } + + function prepareRuleChainMetaData(ruleChainMetaData) { + delete ruleChainMetaData.ruleChainId; + for (var i=0;i { + vm.isConfirmOnExit = val; + }); + + vm.errorTooltips = {}; + vm.isFullscreen = false; vm.editingRuleNode = null; @@ -151,6 +167,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, $scope.$broadcast('form-submit'); if (theForm.$valid) { theForm.$setPristine(); + if (vm.editingRuleNode.error) { + delete vm.editingRuleNode.error; + } vm.ruleChainModel.nodes[vm.editingRuleNodeIndex] = vm.editingRuleNode; vm.editingRuleNode = angular.copy(vm.editingRuleNode); updateRuleNodesHighlight(); @@ -210,7 +229,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } var instances = angular.element.tooltipster.instances(); instances.forEach((instance) => { - instance.destroy(); + if (!instance.isErrorTooltip) { + instance.destroy(); + } }); } @@ -256,6 +277,71 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, }, 500); } + function updateNodeErrorTooltip(node) { + if (node.error) { + var element = angular.element('#' + node.id); + var tooltip = vm.errorTooltips[node.id]; + if (!tooltip || !element.hasClass("tooltipstered")) { + element.tooltipster( + { + theme: 'tooltipster-shadow', + delay: 0, + animationDuration: 0, + trigger: 'custom', + triggerOpen: { + click: false, + tap: false + }, + triggerClose: { + click: false, + tap: false, + scroll: false + }, + side: 'top', + trackOrigin: true + } + ); + var content = '

' + + '
' + + '
' + node.error + '
' + + '
' + + '
'; + var contentElement = angular.element(content); + $compile(contentElement)($scope); + tooltip = element.tooltipster('instance'); + tooltip.isErrorTooltip = true; + tooltip.content(contentElement); + vm.errorTooltips[node.id] = tooltip; + } + $mdUtil.nextTick(() => { + tooltip.open(); + }); + } else { + if (vm.errorTooltips[node.id]) { + tooltip = vm.errorTooltips[node.id]; + tooltip.destroy(); + delete vm.errorTooltips[node.id]; + } + } + } + + function updateErrorTooltips(hide) { + for (var nodeId in vm.errorTooltips) { + var tooltip = vm.errorTooltips[nodeId]; + if (hide) { + tooltip.close(); + } else { + tooltip.open(); + } + } + } + + $scope.$watch(function() { + return vm.isEditingRuleNode || vm.isEditingRuleNodeLink; + }, (val) => { + updateErrorTooltips(val); + }); + vm.editCallbacks = { edgeDoubleClick: function (event, edge) { var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); @@ -381,6 +467,16 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, vm.ruleNodeTypesCanvasControl[componentType].adjustCanvasSize(true); } } + for (componentType in vm.ruleNodeTypesModel) { + var panel = vm.$mdExpansionPanel(componentType); + if (panel) { + if (!vm.ruleNodeTypesModel[componentType].model.nodes.length) { + panel.collapse(); + } else { + panel.expand(); + } + } + } }); } @@ -512,11 +608,9 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, ruleChainNode = { id: 'rule-chain-node-' + vm.nextNodeID++, additionalInfo: ruleChainConnection.additionalInfo, - targetRuleChainId: ruleChainConnection.targetRuleChainId.id, x: ruleChainConnection.additionalInfo.layoutX, y: ruleChainConnection.additionalInfo.layoutY, component: types.ruleChainNodeComponent, - name: ruleChain.name, nodeClass: vm.types.ruleNodeType.RULE_CHAIN.nodeClass, icon: vm.types.ruleNodeType.RULE_CHAIN.icon, connectors: [ @@ -526,6 +620,14 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } ] }; + if (ruleChain.name) { + ruleChainNode.name = ruleChain.name; + ruleChainNode.targetRuleChainId = ruleChainConnection.targetRuleChainId.id; + } else { + ruleChainNode.name = "Unresolved"; + ruleChainNode.targetRuleChainId = null; + ruleChainNode.error = $translate.instant('rulenode.invalid-target-rulechain'); + } ruleChainNodesMap[ruleChainConnection.additionalInfo.ruleChainNodeId] = ruleChainNode; vm.ruleChainModel.nodes.push(ruleChainNode); } @@ -553,11 +655,16 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, updateRuleNodesHighlight(); + validate(); + $mdUtil.nextTick(() => { vm.ruleChainWatch = $scope.$watch('vm.ruleChainModel', function (newVal, oldVal) { - if (!vm.isDirty && !angular.equals(newVal, oldVal)) { - vm.isDirty = true; + if (!angular.equals(newVal, oldVal)) { + validate(); + if (!vm.isDirty) { + vm.isDirty = true; + } } }, true ); @@ -565,91 +672,122 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, } function updateRuleNodesHighlight() { - for (var i=0;i { + vm.isInvalid = false; + for (var i = 0; i < vm.ruleChainModel.nodes.length; i++) { + if (vm.ruleChainModel.nodes[i].error) { + vm.isInvalid = true; + } + updateNodeErrorTooltip(vm.ruleChainModel.nodes[i]); + } + }); + } + function saveRuleChain() { - var ruleChainMetaData = { - ruleChainId: vm.ruleChain.id, - nodes: [], - connections: [], - ruleChainConnections: [] - }; + var saveRuleChainPromise; + if (vm.isImport) { + saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain); + } else { + saveRuleChainPromise = $q.when(vm.ruleChain); + } + saveRuleChainPromise.then( + (ruleChain) => { + vm.ruleChain = ruleChain; + var ruleChainMetaData = { + ruleChainId: vm.ruleChain.id, + nodes: [], + connections: [], + ruleChainConnections: [] + }; - var nodes = []; + var nodes = []; - for (var i=0;i { - vm.ruleChainMetaData = ruleChainMetaData; - prepareRuleChain(); + ruleChainService.saveRuleChainMetaData(ruleChainMetaData).then( + (ruleChainMetaData) => { + vm.ruleChainMetaData = ruleChainMetaData; + if (vm.isImport) { + vm.isDirty = false; + vm.isImport = false; + $mdUtil.nextTick(() => { + $state.go('home.ruleChains.ruleChain', {ruleChainId: vm.ruleChain.id.id}); + }); + } else { + prepareRuleChain(); + } + } + ); } ); } @@ -662,12 +800,14 @@ export function RuleChainController($stateParams, $scope, $compile, $q, $mdUtil, ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration); + var ruleChainId = vm.ruleChain.id ? vm.ruleChain.id.id : null; + $mdDialog.show({ controller: 'AddRuleNodeController', controllerAs: 'vm', templateUrl: addRuleNodeTemplate, parent: angular.element($document[0].body), - locals: {ruleNode: ruleNode, ruleChainId: vm.ruleChain.id.id}, + locals: {ruleNode: ruleNode, ruleChainId: ruleChainId}, fullscreen: true, targetEvent: $event }).then(function (ruleNode) { diff --git a/ui/src/app/rulechain/rulechain.routes.js b/ui/src/app/rulechain/rulechain.routes.js index 48559d931a..2aefd82379 100644 --- a/ui/src/app/rulechain/rulechain.routes.js +++ b/ui/src/app/rulechain/rulechain.routes.js @@ -76,11 +76,52 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider } }, data: { + import: false, searchEnabled: true, pageTitle: 'rulechain.rulechain' }, ncyBreadcrumb: { label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' } + }).state('home.ruleChains.importRuleChain', { + url: '/ruleChain/import', + reloadOnSearch: false, + module: 'private', + auth: ['SYS_ADMIN', 'TENANT_ADMIN'], + views: { + "content@home": { + templateUrl: ruleChainTemplate, + controller: 'RuleChainController', + controllerAs: 'vm' + } + }, + params: { + ruleChainImport: {} + }, + resolve: { + ruleChain: + /*@ngInject*/ + function($stateParams) { + return $stateParams.ruleChainImport.ruleChain; + }, + ruleChainMetaData: + /*@ngInject*/ + function($stateParams) { + return $stateParams.ruleChainImport.metadata; + }, + ruleNodeComponents: + /*@ngInject*/ + function($stateParams, ruleChainService) { + return ruleChainService.getRuleNodeComponents(); + } + }, + data: { + import: true, + searchEnabled: true, + pageTitle: 'rulechain.rulechain' + }, + ncyBreadcrumb: { + label: '{"icon": "settings_ethernet", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}' + } }); } diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index 850de3c88e..187a722e0f 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -125,13 +125,16 @@ color: #333; border: solid 1px #777; font-size: 12px; - &.tb-rule-node-highlighted { + &.tb-rule-node-highlighted:not(.tb-rule-node-invalid) { box-shadow: 0 0 10px 6px #51cbee; .tb-node-title { text-decoration: underline; font-weight: bold; } } + &.tb-rule-node-invalid { + box-shadow: 0 0 10px 6px #ff5c50; + } &.tb-input-type { background-color: #a3eaa9; user-select: none; @@ -191,10 +194,6 @@ bottom: 0; background-color: #000; opacity: 0; -/* &.tb-rule-node-highlighted { - background-color: green; - opacity: 0.15; - }*/ } &.fc-hover { .fc-node-overlay { @@ -391,6 +390,14 @@ font-size: 14px; width: 300px; color: #333; +} + +.tb-rule-node-error-tooltip { + font-size: 16px; + color: #ea0d0d; +} + +.tb-rule-node-tooltip, .tb-rule-node-error-tooltip { #tooltip-content { .tb-node-title { font-weight: 600; diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index a843b03ffe..37fcd9bfb3 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -16,7 +16,7 @@ --> - @@ -185,7 +185,7 @@ - diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js index 2a30b0c98f..7c857f23b6 100644 --- a/ui/src/app/rulechain/rulechains.controller.js +++ b/ui/src/app/rulechain/rulechains.controller.js @@ -63,8 +63,8 @@ export default function RuleChainsController(ruleChainService, userService, impo { onAction: function ($event) { importExport.importRuleChain($event).then( - function() { - vm.grid.refreshList(); + function(ruleChainImport) { + $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport}); } ); }, diff --git a/ui/src/app/rulechain/rulenode.tpl.html b/ui/src/app/rulechain/rulenode.tpl.html index 83ce988684..973ea1fa9e 100644 --- a/ui/src/app/rulechain/rulenode.tpl.html +++ b/ui/src/app/rulechain/rulenode.tpl.html @@ -22,8 +22,8 @@ ng-mousedown="callbacks.mouseDown($event, node)" ng-mouseenter="callbacks.mouseEnter($event, node)" ng-mouseleave="callbacks.mouseLeave($event, node)"> -
-
+
+
{{node.icon}}
From c9717f4d1ddee68a572471202f08c5e5250d81d8 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 2 Apr 2018 20:07:20 +0300 Subject: [PATCH 51/75] Enrichment Rule nodes config UI --- .../rule/engine/data/RelationsQuery.java | 31 +++++++++++++++++++ .../engine/metadata/TbGetAttributesNode.java | 4 ++- .../metadata/TbGetCustomerAttributeNode.java | 4 ++- .../TbGetRelatedAttrNodeConfiguration.java | 17 +++++++--- .../metadata/TbGetRelatedAttributeNode.java | 7 +++-- .../metadata/TbGetTenantAttributeNode.java | 4 ++- .../transform/TbChangeOriginatorNode.java | 8 ++--- .../TbChangeOriginatorNodeConfiguration.java | 18 ++++++++--- .../EntitiesRelatedEntityIdAsyncLoader.java | 25 ++++++++++----- .../static/rulenode/rulenode-core-config.css | 2 +- .../static/rulenode/rulenode-core-config.js | 2 +- .../relation/relation-filters.directive.js | 1 + 12 files changed, 95 insertions(+), 28 deletions(-) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/data/RelationsQuery.java diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/data/RelationsQuery.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/data/RelationsQuery.java new file mode 100644 index 0000000000..1d944ec327 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/data/RelationsQuery.java @@ -0,0 +1,31 @@ +/** + * Copyright © 2016-2018 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.rule.engine.data; + +import lombok.Data; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.common.data.relation.EntityTypeFilter; + +import java.util.List; + +@Data +public class RelationsQuery { + + private EntitySearchDirection direction; + private int maxLevel = 1; + private List filters; + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java index 7bf70f4ed9..fc65e43bf5 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java @@ -43,7 +43,9 @@ import static org.thingsboard.server.common.data.DataConstants.*; nodeDetails = "If Attributes enrichment configured, CLIENT/SHARED/SERVER attributes are added into Message metadata " + "with specific prefix: cs/shared/ss. To access those attributes in other nodes this template can be used " + "metadata.cs.temperature or metadata.shared.limit " + - "If Latest Telemetry enrichment configured, latest telemetry added into metadata without prefix.") + "If Latest Telemetry enrichment configured, latest telemetry added into metadata without prefix.", + uiResources = {"static/rulenode/rulenode-core-config.js"}, + configDirective = "tbEnrichmentNodeOriginatorAttributesConfig") public class TbGetAttributesNode implements TbNode { private TbGetAttributesNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java index c59a65e27d..b092badaf4 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java @@ -30,7 +30,9 @@ import org.thingsboard.server.common.data.plugin.ComponentType; nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbEnrichmentNodeCustomerAttributesConfig") public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java index 82119926af..dccd87879a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java @@ -16,18 +16,19 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; -import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.rule.engine.data.RelationsQuery; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.common.data.relation.EntityTypeFilter; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @Data public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfiguration { - private String relationType; - private EntitySearchDirection direction; + private RelationsQuery relationsQuery; @Override public TbGetRelatedAttrNodeConfiguration defaultConfiguration() { @@ -36,8 +37,14 @@ public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfig attrMapping.putIfAbsent("temperature", "tempo"); configuration.setAttrMapping(attrMapping); configuration.setTelemetry(true); - configuration.setRelationType(EntityRelation.CONTAINS_TYPE); - configuration.setDirection(EntitySearchDirection.FROM); + + RelationsQuery relationsQuery = new RelationsQuery(); + relationsQuery.setDirection(EntitySearchDirection.FROM); + relationsQuery.setMaxLevel(1); + EntityTypeFilter entityTypeFilter = new EntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.emptyList()); + relationsQuery.setFilters(Collections.singletonList(entityTypeFilter)); + configuration.setRelationsQuery(relationsQuery); + return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java index 603746ef29..8f65c31aa4 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java @@ -32,7 +32,10 @@ import org.thingsboard.server.common.data.plugin.ComponentType; "If multiple Related Entities are found, only first Entity is used for attributes enrichment, other entities are discarded. " + "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbEnrichmentNodeRelatedAttributesConfig") + public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { private TbGetRelatedAttrNodeConfiguration config; @@ -45,6 +48,6 @@ public class TbGetRelatedAttributeNode extends TbEntityGetAttrNode { @Override protected ListenableFuture findEntityAsync(TbContext ctx, EntityId originator) { - return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, originator, config.getDirection(), config.getRelationType()); + return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, originator, config.getRelationsQuery()); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java index 3165385587..f0d28d3290 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java @@ -32,7 +32,9 @@ import org.thingsboard.server.common.data.plugin.ComponentType; nodeDescription = "Add Originators Tenant Attributes or Latest Telemetry into Message Metadata", nodeDetails = "If Attributes enrichment configured, server scope attributes are added into Message metadata. " + "To access those attributes in other nodes this template can be used " + - "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata") + "metadata.temperature. If Latest Telemetry enrichment configured, latest telemetry added into metadata", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbEnrichmentNodeTenantAttributesConfig") public class TbGetTenantAttributeNode extends TbEntityGetAttrNode { @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index cf761f295f..6f52fb95fc 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -68,7 +68,7 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode { case TENANT_SOURCE: return EntitiesTenantIdAsyncLoader.findEntityIdAsync(ctx, original); case RELATED_SOURCE: - return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, original, config.getDirection(), config.getRelationType()); + return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, original, config.getRelationsQuery()); default: return Futures.immediateFailedFuture(new IllegalStateException("Unexpected originator source " + config.getOriginatorSource())); } @@ -82,9 +82,9 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode { } if (conf.getOriginatorSource().equals(RELATED_SOURCE)) { - if (conf.getDirection() == null || StringUtils.isBlank(conf.getRelationType())) { - log.error("Related source for TbChangeOriginatorNode should have direction and relationType. Actual [{}] [{}]", - conf.getDirection(), conf.getRelationType()); + if (conf.getRelationsQuery() == null) { + log.error("Related source for TbChangeOriginatorNode should have relations query. Actual [{}]", + conf.getRelationsQuery()); throw new IllegalArgumentException("Wrong config for RElated Source in TbChangeOriginatorNode" + conf.getOriginatorSource()); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java index 3370408231..7cd77bfc59 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java @@ -17,22 +17,32 @@ package org.thingsboard.rule.engine.transform; import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.rule.engine.data.RelationsQuery; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.common.data.relation.EntityTypeFilter; + +import java.util.Collections; @Data public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfiguration implements NodeConfiguration { private String originatorSource; - private EntitySearchDirection direction; - private String relationType; + + private RelationsQuery relationsQuery; @Override public TbChangeOriginatorNodeConfiguration defaultConfiguration() { TbChangeOriginatorNodeConfiguration configuration = new TbChangeOriginatorNodeConfiguration(); configuration.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE); - configuration.setDirection(EntitySearchDirection.FROM); - configuration.setRelationType(EntityRelation.CONTAINS_TYPE); + + RelationsQuery relationsQuery = new RelationsQuery(); + relationsQuery.setDirection(EntitySearchDirection.FROM); + relationsQuery.setMaxLevel(1); + EntityTypeFilter entityTypeFilter = new EntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.emptyList()); + relationsQuery.setFilters(Collections.singletonList(entityTypeFilter)); + configuration.setRelationsQuery(relationsQuery); + configuration.setStartNewChain(false); return configuration; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java index ac69c5dd59..08ce38e591 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java @@ -20,32 +20,41 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.apache.commons.collections.CollectionUtils; import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.data.RelationsQuery; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.common.data.relation.RelationsSearchParameters; import org.thingsboard.server.dao.relation.RelationService; import java.util.List; -import static org.thingsboard.server.common.data.relation.RelationTypeGroup.COMMON; - public class EntitiesRelatedEntityIdAsyncLoader { public static ListenableFuture findEntityAsync(TbContext ctx, EntityId originator, - EntitySearchDirection direction, String relationType) { + RelationsQuery relationsQuery) { RelationService relationService = ctx.getRelationService(); - if (direction == EntitySearchDirection.FROM) { - ListenableFuture> asyncRelation = relationService.findByFromAndTypeAsync(originator, relationType, COMMON); + EntityRelationsQuery query = buildQuery(originator, relationsQuery); + ListenableFuture> asyncRelation = relationService.findByQuery(query); + if (relationsQuery.getDirection() == EntitySearchDirection.FROM) { return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getTo()) : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); - } else if (direction == EntitySearchDirection.TO) { - ListenableFuture> asyncRelation = relationService.findByToAndTypeAsync(originator, relationType, COMMON); + } else if (relationsQuery.getDirection() == EntitySearchDirection.TO) { return Futures.transform(asyncRelation, (AsyncFunction, EntityId>) r -> CollectionUtils.isNotEmpty(r) ? Futures.immediateFuture(r.get(0).getFrom()) : Futures.immediateFailedFuture(new IllegalStateException("Relation not found"))); } - return Futures.immediateFailedFuture(new IllegalStateException("Unknown direction")); } + + private static EntityRelationsQuery buildQuery(EntityId originator, RelationsQuery relationsQuery) { + EntityRelationsQuery query = new EntityRelationsQuery(); + RelationsSearchParameters parameters = new RelationsSearchParameters(originator, + relationsQuery.getDirection(), relationsQuery.getMaxLevel()); + query.setParameters(parameters); + query.setFilters(relationsQuery.getFilters()); + return query; + } } diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css index a6103c1d56..c91d7da72d 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css @@ -1,2 +1,2 @@ -.tb-message-type-autocomplete .tb-not-found{display:block;line-height:1.5;height:48px}.tb-message-type-autocomplete .tb-not-found .tb-no-entries{line-height:48px}.tb-message-type-autocomplete li{height:auto!important;white-space:normal!important} +.tb-message-type-autocomplete .tb-not-found{display:block;line-height:1.5;height:48px}.tb-message-type-autocomplete .tb-not-found .tb-no-entries{line-height:48px}.tb-message-type-autocomplete li{height:auto!important;white-space:normal!important}.tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}.tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:rgba(0,0,0,.54);font-size:12px;font-weight:700;white-space:nowrap}.tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:20px;max-height:300px;overflow:auto}.tb-kv-map-config .body .row{padding-top:5px;max-height:40px}.tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}.tb-kv-map-config .body md-input-container.cell{margin:0;max-height:40px}.tb-kv-map-config .body .md-button{margin:0} /*# sourceMappingURL=rulenode-core-config.css.map*/ \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index 3fe859d90f..b2d2af9088 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(s){if(a[s])return a[s].exports;var n=a[s]={exports:{},id:s,loaded:!1};return e[s].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var a={};return t.m=e,t.c=a,t.p="/static/",t(0)}([function(e,t,a){e.exports=a(8)},function(e,t){},function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t,a){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}function n(e,t,a){var s=function(s,n,r,l){function u(){if(l.$viewValue){for(var e=[],t=0;t {{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},3,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(3),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(14),i=r(n),l=a(15),s=r(l),o=a(12),u=r(o),d=a(16),c=r(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",s.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var a=function(a,r,n,i){var s=l.default;r.html(s);var o=186;a.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,o],a.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(a.configuration)}),i.$render=function(){a.configuration=i.$viewValue},e(r.contents())(a)};return{restrict:"E",require:"^ngModel",scope:{},link:a}}n.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(4),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(5),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(6),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(19),i=r(n),l=a(18),s=r(l),o=a(20),u=r(o);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",s.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t,a){var r=function(r,n,i,s){function o(){if(s.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function s(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function o(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),n.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),n.$setValidity("kvMap",e)}var d=l.default;a.html(d),t.ngModelCtrl=n,t.removeKeyVal=i,t.addKeyVal=s,t.kvList=[],t.$watch("query",function(e,a){angular.equals(e,a)||n.$setViewValue(t.query)}),n.$render=function(){if(n.$viewValue){var e=n.$viewValue;t.kvList.length=0;for(var a in e)t.kvList.push({key:a,value:e[a]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||o()},!0),u()},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(10),l=r(i);a(2)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var a=function(a,r,n,i){var s=l.default;r.html(s),a.types=t,a.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(a.query)}),i.$render=function(){a.query=i.$viewValue},e(r.contents())(a)};return{restrict:"E",require:"^ngModel",scope:{},link:a}}n.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(11),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(26),i=r(n),l=a(17),s=r(l),o=a(13),u=r(o),d=a(22),c=r(d),m=a(21),f=r(m),p=a(25),g=r(p);t.default=angular.module("thingsboard.ruleChain.config",[i.default,s.default,u.default]).directive("tbRelationsQueryConfig",c.default).directive("tbKvMapConfig",f.default).config(g.default).name},function(e,t){"use strict";function a(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified."},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=a},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){(0,l.default)(t);for(var a in t){var r=t[a];e.translations(a,r)}}n.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(24),l=r(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}}}).name}])); //# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file diff --git a/ui/src/app/entity/relation/relation-filters.directive.js b/ui/src/app/entity/relation/relation-filters.directive.js index 00d3b26035..9ab66cac72 100644 --- a/ui/src/app/entity/relation/relation-filters.directive.js +++ b/ui/src/app/entity/relation/relation-filters.directive.js @@ -46,6 +46,7 @@ export default function RelationFilters($compile, $templateCache) { ngModelCtrl.$render = function () { if (ngModelCtrl.$viewValue) { var value = ngModelCtrl.$viewValue; + scope.relationFilters.length = 0; value.forEach(function (filter) { scope.relationFilters.push(filter); }); From 76dd0a4542e9a1bff0b1ac9b4c2f423f624f98d7 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 2 Apr 2018 20:37:26 +0300 Subject: [PATCH 52/75] Transformation Rule nodes config UI --- .../rule/engine/transform/TbChangeOriginatorNode.java | 4 +++- .../thingsboard/rule/engine/transform/TbTransformMsgNode.java | 4 +++- .../resources/public/static/rulenode/rulenode-core-config.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java index 6f52fb95fc..05ad49c144 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java @@ -39,7 +39,9 @@ import java.util.HashSet; configClazz = TbChangeOriginatorNodeConfiguration.class, nodeDescription = "Change Message Originator To Tenant/Customer/Related Entity", nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + - "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ") + "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbTransformationNodeChangeOriginatorConfig") public class TbChangeOriginatorNode extends TbAbstractTransformNode { protected static final String CUSTOMER_SOURCE = "CUSTOMER"; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index 27e46fe091..626d05784a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -31,7 +31,9 @@ import javax.script.Bindings; nodeDescription = "Change Message payload and Metadata using JavaScript", nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside.
" + "metadata - is a Message metadata.
" + - "msg - is a Message payload.
Any properties can be changed/removed/added in those objects.") + "msg - is a Message payload.
Any properties can be changed/removed/added in those objects.", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbTransformationNodeScriptConfig") public class TbTransformMsgNode extends TbAbstractTransformNode { private TbTransformMsgNodeConfiguration config; diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index b2d2af9088..69ff7aec90 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(r){if(a[r])return a[r].exports;var n=a[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var a={};return t.m=e,t.c=a,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var a=t.slice(1),r=e[t[0]];return function(e,t,n){r.apply(this,[e,t,n].concat(a))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,a){e.exports=a(23)},function(e,t){},1,function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},3,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(3),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(14),i=r(n),l=a(15),s=r(l),o=a(12),u=r(o),d=a(16),c=r(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",s.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var a=function(a,r,n,i){var s=l.default;r.html(s);var o=186;a.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,o],a.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(a.configuration)}),i.$render=function(){a.configuration=i.$viewValue},e(r.contents())(a)};return{restrict:"E",require:"^ngModel",scope:{},link:a}}n.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(4),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(5),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e){var t=function(t,a,r,n){var i=l.default;a.html(i),t.$watch("configuration",function(e,a){angular.equals(e,a)||n.$setViewValue(t.configuration)}),n.$render=function(){t.configuration=n.$viewValue},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(6),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(19),i=r(n),l=a(18),s=r(l),o=a(20),u=r(o);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",s.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t,a){var r=function(r,n,i,s){function o(){if(s.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function s(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function o(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),n.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),n.$setValidity("kvMap",e)}var d=l.default;a.html(d),t.ngModelCtrl=n,t.removeKeyVal=i,t.addKeyVal=s,t.kvList=[],t.$watch("query",function(e,a){angular.equals(e,a)||n.$setViewValue(t.query)}),n.$render=function(){if(n.$viewValue){var e=n.$viewValue;t.kvList.length=0;for(var a in e)t.kvList.push({key:a,value:e[a]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||o()},!0),u()},e(a.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}n.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(10),l=r(i);a(2)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){var a=function(a,r,n,i){var s=l.default;r.html(s),a.types=t,a.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(a.query)}),i.$render=function(){a.query=i.$viewValue},e(r.contents())(a)};return{restrict:"E",require:"^ngModel",scope:{},link:a}}n.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(11),l=r(i)},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(26),i=r(n),l=a(17),s=r(l),o=a(13),u=r(o),d=a(22),c=r(d),m=a(21),f=r(m),p=a(25),g=r(p);t.default=angular.module("thingsboard.ruleChain.config",[i.default,s.default,u.default]).directive("tbRelationsQueryConfig",c.default).directive("tbKvMapConfig",f.default).config(g.default).name},function(e,t){"use strict";function a(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified."},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=a},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){(0,l.default)(t);for(var a in t){var r=t[a];e.translations(a,r)}}n.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=n;var i=a(24),l=r(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}}}).name}])); +!function(e){function t(a){if(n[a])return n[a].exports;var r=n[a]={exports:{},id:a,loaded:!1};return e[a].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),a=e[t[0]];return function(e,t,r){a.apply(this,[e,t,r].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(28)},function(e,t){},1,function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},3,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(3),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(16),i=a(r),l=n(17),o=a(l),s=n(14),u=a(s),d=n(18),c=a(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",o.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(4),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(5),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(6),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(21),i=a(r),l=n(20),o=a(l),s=n(22),u=a(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",o.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t,n){var a=function(a,r,i,o){function s(){if(o.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function o(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),r.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),r.$setValidity("kvMap",e)}var d=l.default;n.html(d),t.ngModelCtrl=r,t.removeKeyVal=i,t.addKeyVal=o,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||r.$setViewValue(t.query)}),r.$render=function(){if(r.$viewValue){var e=r.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(10),l=a(i);n(2)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(11),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(12),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(25),i=a(r),l=n(27),o=a(l);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",o.default).name},[32,13],function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(31),i=a(r),l=n(19),o=a(l),s=n(15),u=a(s),d=n(26),c=a(d),m=n(24),f=a(m),g=n(23),p=a(g),b=n(30),y=a(b);t.default=angular.module("thingsboard.ruleChain.config",[i.default,o.default,u.default,c.default]).directive("tbRelationsQueryConfig",f.default).directive("tbKvMapConfig",p.default).config(y.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){(0,l.default)(t);for(var n in t){var a=t[n];e.translations(n,a)}}r.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(29),l=a(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var l=n(a),o=r(l)}])); //# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file From 0fb9f21e7867ac9991d7c4bf18d6b8397a944a40 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 2 Apr 2018 21:09:34 +0300 Subject: [PATCH 53/75] Telmetry plugin removed --- .../actors/ruleChain/DefaultTbContext.java | 15 +++- .../controller/TelemetryController.java | 28 +++--- .../controller/plugin/TbWebSocketHandler.java | 4 +- .../TelemetrySubscriptionService.java | 16 +--- .../api/RuleEngineTelemetryService.java | 21 +++++ .../rule/engine/api/TbContext.java | 2 + rule-engine/rule-engine-components/pom.xml | 9 ++ .../rule/engine/debug/TbMsgGeneratorNode.java | 34 +++++--- .../TbMsgGeneratorNodeConfiguration.java | 4 + .../engine/telemetry/TbMsgTelemetryNode.java | 87 +++++++++++++++++++ .../TbMsgTelemetryNodeConfiguration.java | 34 ++++++++ .../telemetry/TelemetryNodeCallback.java | 27 ++++++ 12 files changed, 238 insertions(+), 43 deletions(-) create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 7dca2c8409..ae60308833 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -16,8 +16,10 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.ActorRef; +import akka.actor.Cancellable; import com.google.common.base.Function; import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.RuleNodeId; @@ -164,6 +166,11 @@ class DefaultTbContext implements TbContext { return mainCtx.getTsService(); } + @Override + public RuleEngineTelemetryService getTelemetryService() { + return mainCtx.getTsSubService(); + } + @Override public RelationService getRelationService() { return mainCtx.getRelationService(); diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index c1338e4c58..25f09cae65 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -115,7 +115,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/keys/attributes", method = RequestMethod.GET) @ResponseBody public DeferredResult getAttributeKeys( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { @@ -123,7 +123,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/keys/ATTRIBUTES/{scope}", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/keys/attributes/{scope}", method = RequestMethod.GET) @ResponseBody public DeferredResult getAttributeKeysByScope( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr @@ -133,7 +133,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/values/attributes", method = RequestMethod.GET) @ResponseBody public DeferredResult getAttributes( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @@ -144,7 +144,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/ATTRIBUTES/{scope}", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/values/attributes/{scope}", method = RequestMethod.GET) @ResponseBody public DeferredResult getAttributesByScope( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @@ -156,7 +156,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/keys/TIMESERIES", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/keys/timeseries", method = RequestMethod.GET) @ResponseBody public DeferredResult getTimeseriesKeys( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException { @@ -167,7 +167,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET) @ResponseBody public DeferredResult getLatestTimeseries( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @@ -180,7 +180,7 @@ public class TelemetryController extends BaseController { @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/values/TIMESERIES", method = RequestMethod.GET) + @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET, params = {"keys", "startTs", "endTs"}) @ResponseBody public DeferredResult getTimeseries( @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @@ -222,7 +222,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/ATTRIBUTES/{scope}", method = RequestMethod.POST) + @RequestMapping(value = "/{entityType}/{entityId}/attributes/{scope}", method = RequestMethod.POST) @ResponseBody public DeferredResult saveEntityAttributesV2(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @PathVariable("scope") String scope, @@ -232,7 +232,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/TIMESERIES/{scope}", method = RequestMethod.POST) + @RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}", method = RequestMethod.POST) @ResponseBody public DeferredResult saveEntityTelemetry(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @PathVariable("scope") String scope, @@ -242,7 +242,7 @@ public class TelemetryController extends BaseController { } @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") - @RequestMapping(value = "/{entityType}/{entityId}/TIMESERIES/{scope}/{ttl}", method = RequestMethod.POST) + @RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}/{ttl}", method = RequestMethod.POST) @ResponseBody public DeferredResult saveEntityTelemetryWithTTL(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr, @PathVariable("scope") String scope, @PathVariable("ttl") Long ttl, diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java index ba5f9f96fc..42d6a20d56 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java @@ -155,7 +155,9 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements PluginWe if (internalId != null) { SessionMetaData sessionMd = internalSessionMap.get(internalId); if (sessionMd != null) { - sessionMd.session.sendMessage(new TextMessage(msg)); + synchronized (sessionMd) { + sessionMd.session.sendMessage(new TextMessage(msg)); + } } else { log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId); } diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java index 7bf223f83f..923d06bc7f 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TelemetrySubscriptionService.java @@ -15,21 +15,14 @@ */ package org.thingsboard.server.service.telemetry; -import com.google.common.util.concurrent.FutureCallback; +import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.data.kv.KvEntry; -import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.extensions.core.plugin.telemetry.sub.SubscriptionState; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Created by ashvayka on 27.03.18. */ -public interface TelemetrySubscriptionService { +public interface TelemetrySubscriptionService extends RuleEngineTelemetryService { void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub); @@ -37,9 +30,4 @@ public interface TelemetrySubscriptionService { void removeSubscription(String sessionId, int cmdId); - void saveAndNotify(EntityId entityId, List ts, FutureCallback callback); - - void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback); - - void saveAndNotify(EntityId entityId, String scope, List attributes, FutureCallback callback); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java new file mode 100644 index 0000000000..253a2aff24 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java @@ -0,0 +1,21 @@ +package org.thingsboard.rule.engine.api; + +import com.google.common.util.concurrent.FutureCallback; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; + +import java.util.List; + +/** + * Created by ashvayka on 02.04.18. + */ +public interface RuleEngineTelemetryService { + + void saveAndNotify(EntityId entityId, List ts, FutureCallback callback); + + void saveAndNotify(EntityId entityId, List ts, long ttl, FutureCallback callback); + + void saveAndNotify(EntityId entityId, String scope, List attributes, FutureCallback callback); + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 44bd3f56c9..c4514a8bc1 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -81,6 +81,8 @@ public interface TbContext { RuleChainService getRuleChainService(); + RuleEngineTelemetryService getTelemetryService(); + TimeseriesService getTimeseriesService(); RelationService getRelationService(); diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml index a97493bdd7..3deea9b180 100644 --- a/rule-engine/rule-engine-components/pom.xml +++ b/rule-engine/rule-engine-components/pom.xml @@ -43,6 +43,11 @@ dao provided + + org.thingsboard.common + transport + provided + ch.qos.logback logback-core @@ -88,6 +93,10 @@ mockito-all test + + org.thingsboard.common + transport + diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java index 43851a3c86..529420387e 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - * + *

+ * 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. @@ -17,6 +17,7 @@ package org.thingsboard.rule.engine.debug; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.ListeningExecutor; import org.thingsboard.rule.engine.api.RuleNode; @@ -26,6 +27,8 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration; import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.filter.TbJsFilterNodeConfiguration; import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; @@ -33,6 +36,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import javax.script.Bindings; import java.nio.charset.StandardCharsets; +import java.util.UUID; import java.util.concurrent.TimeUnit; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @@ -53,30 +57,40 @@ public class TbMsgGeneratorNode implements TbNode { private TbMsgGeneratorNodeConfiguration config; private long delay; + private EntityId originatorId; + private UUID nextTickId; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbMsgGeneratorNodeConfiguration.class); this.delay = TimeUnit.SECONDS.toMillis(config.getPeriodInSeconds()); - ctx.tellSelf(newTickMsg(ctx), delay); + if (!StringUtils.isEmpty(config.getOriginatorId())) { + originatorId = EntityIdFactory.getByTypeAndUuid(config.getOriginatorType(), config.getOriginatorId()); + } else { + originatorId = ctx.getSelfId(); + } + sentTickMsg(ctx); } @Override public void onMsg(TbContext ctx, TbMsg msg) { - if (msg.getType().equals(TB_MSG_GENERATOR_NODE_MSG)) { + if (msg.getType().equals(TB_MSG_GENERATOR_NODE_MSG) && msg.getId().equals(nextTickId)) { TbMsgMetaData metaData = new TbMsgMetaData(); if (config.getMsgMetaData() != null) { config.getMsgMetaData().forEach(metaData::putValue); } - ctx.tellNext(new TbMsg(UUIDs.timeBased(), config.getMsgType(), ctx.getSelfId(), metaData, config.getMsgBody().getBytes(StandardCharsets.UTF_8))); - ctx.tellSelf(newTickMsg(ctx), delay); + ctx.tellNext(new TbMsg(UUIDs.timeBased(), config.getMsgType(), originatorId, metaData, config.getMsgBody().getBytes(StandardCharsets.UTF_8))); + sentTickMsg(ctx); } } - private TbMsg newTickMsg(TbContext ctx) { - return new TbMsg(UUIDs.timeBased(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), new byte[]{}); + private void sentTickMsg(TbContext ctx) { + TbMsg tickMsg = new TbMsg(UUIDs.timeBased(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), new byte[]{}); + nextTickId = tickMsg.getId(); + ctx.tellSelf(tickMsg, delay); } + @Override public void destroy() { } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java index e15b13f1ca..8eb37a2aef 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java @@ -17,6 +17,8 @@ package org.thingsboard.rule.engine.debug; import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.EntityType; + import java.util.Map; @Data @@ -24,6 +26,8 @@ public class TbMsgGeneratorNodeConfiguration implements NodeConfiguration msgMetaData; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java new file mode 100644 index 0000000000..9314921fa1 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java @@ -0,0 +1,87 @@ +/** + * Copyright © 2016-2018 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.rule.engine.telemetry; + +import com.google.gson.JsonParser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.RuleNode; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.transport.adaptor.JsonConverter; + +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "save timeseries data", + configClazz = TbMsgTelemetryNodeConfiguration.class, + nodeDescription = "Saves timeseries data", + nodeDetails = "Saves timeseries telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY' message type" +) + +public class TbMsgTelemetryNode implements TbNode { + + private TbMsgTelemetryNodeConfiguration config; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbMsgTelemetryNodeConfiguration.class); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + if (!msg.getType().equals("POST_TELEMETRY")) { + ctx.tellError(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType())); + return; + } + + String src = new String(msg.getData(), StandardCharsets.UTF_8); + TelemetryUploadRequest telemetryUploadRequest = JsonConverter.convertToTelemetry(new JsonParser().parse(src)); + Map> tsKvMap = telemetryUploadRequest.getData(); + if (tsKvMap == null) { + ctx.tellError(msg, new IllegalArgumentException("Msg body us empty: " + src)); + return; + } + List tsKvEntryList = new ArrayList<>(); + for (Map.Entry> tsKvEntry : tsKvMap.entrySet()) { + for (KvEntry kvEntry : tsKvEntry.getValue()) { + tsKvEntryList.add(new BasicTsKvEntry(tsKvEntry.getKey(), kvEntry)); + } + } + String ttlValue = msg.getMetaData().getValue("TTL"); + long ttl = !StringUtils.isEmpty(ttlValue) ? Long.valueOf(ttlValue) : config.getDefaultTTL(); + ctx.getTelemetryService().saveAndNotify(msg.getOriginator(), tsKvEntryList, ttl, new TelemetryNodeCallback(ctx, msg)); + } + + @Override + public void destroy() { + } + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java new file mode 100644 index 0000000000..8d6b7dcf6e --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2018 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.rule.engine.telemetry; + +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; + +import java.util.Map; + +@Data +public class TbMsgTelemetryNodeConfiguration implements NodeConfiguration { + + private long defaultTTL; + + @Override + public TbMsgTelemetryNodeConfiguration defaultConfiguration() { + TbMsgTelemetryNodeConfiguration configuration = new TbMsgTelemetryNodeConfiguration(); + configuration.setDefaultTTL(0L); + return configuration; + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java new file mode 100644 index 0000000000..a7893263c1 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java @@ -0,0 +1,27 @@ +package org.thingsboard.rule.engine.telemetry; + +import com.google.common.util.concurrent.FutureCallback; +import lombok.Data; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.server.common.msg.TbMsg; + +import javax.annotation.Nullable; + +/** + * Created by ashvayka on 02.04.18. + */ +@Data +class TelemetryNodeCallback implements FutureCallback { + private final TbContext ctx; + private final TbMsg msg; + + @Override + public void onSuccess(@Nullable Void result) { + ctx.tellNext(msg); + } + + @Override + public void onFailure(Throwable t) { + ctx.tellError(msg, t); + } +} From 4024e423245e9becb1dd290b23ebf2eed7dc7557 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 3 Apr 2018 12:18:45 +0300 Subject: [PATCH 54/75] Action Rule nodes config UI --- .../rule/engine/debug/TbMsgGeneratorNode.java | 4 +- .../engine/telemetry/TbMsgTelemetryNode.java | 4 +- .../static/rulenode/rulenode-core-config.css | 2 +- .../static/rulenode/rulenode-core-config.js | 2 +- ui/src/app/components/details-sidenav.scss | 10 + .../app/components/json-content.directive.js | 175 ++++++++++++++++++ ui/src/app/components/json-content.scss | 35 ++++ ui/src/app/components/json-content.tpl.html | 31 ++++ ui/src/app/layout/index.js | 4 +- 9 files changed, 262 insertions(+), 5 deletions(-) create mode 100644 ui/src/app/components/json-content.directive.js create mode 100644 ui/src/app/components/json-content.scss create mode 100644 ui/src/app/components/json-content.tpl.html diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java index 529420387e..8739650a17 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -48,7 +48,9 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; configClazz = TbMsgGeneratorNodeConfiguration.class, nodeDescription = "Periodically generates messages", nodeDetails = "Generates messages with configurable period. ", - inEnabled = false + inEnabled = false, + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbActionNodeGeneratorConfig" ) public class TbMsgGeneratorNode implements TbNode { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java index 9314921fa1..fc8a9db148 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java @@ -43,7 +43,9 @@ import java.util.Map; name = "save timeseries data", configClazz = TbMsgTelemetryNodeConfiguration.class, nodeDescription = "Saves timeseries data", - nodeDetails = "Saves timeseries telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY' message type" + nodeDetails = "Saves timeseries telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY' message type", + uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, + configDirective = "tbActionNodeTelemetryConfig" ) public class TbMsgTelemetryNode implements TbNode { diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css index c91d7da72d..b1728b184f 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.css @@ -1,2 +1,2 @@ -.tb-message-type-autocomplete .tb-not-found{display:block;line-height:1.5;height:48px}.tb-message-type-autocomplete .tb-not-found .tb-no-entries{line-height:48px}.tb-message-type-autocomplete li{height:auto!important;white-space:normal!important}.tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}.tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:rgba(0,0,0,.54);font-size:12px;font-weight:700;white-space:nowrap}.tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:20px;max-height:300px;overflow:auto}.tb-kv-map-config .body .row{padding-top:5px;max-height:40px}.tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}.tb-kv-map-config .body md-input-container.cell{margin:0;max-height:40px}.tb-kv-map-config .body .md-button{margin:0} +.tb-message-type-autocomplete .tb-not-found{display:block;line-height:1.5;height:48px}.tb-message-type-autocomplete .tb-not-found .tb-no-entries{line-height:48px}.tb-message-type-autocomplete li{height:auto!important;white-space:normal!important}.tb-generator-config tb-json-content.tb-message-body,.tb-generator-config tb-json-object-edit.tb-metadata-json{height:200px;display:block}.tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}.tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:rgba(0,0,0,.54);font-size:12px;font-weight:700;white-space:nowrap}.tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:20px;max-height:300px;overflow:auto}.tb-kv-map-config .body .row{padding-top:5px;max-height:40px}.tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}.tb-kv-map-config .body md-input-container.cell{margin:0;max-height:40px}.tb-kv-map-config .body .md-button{margin:0} /*# sourceMappingURL=rulenode-core-config.css.map*/ \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index 69ff7aec90..62a0ff56f2 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(a){if(n[a])return n[a].exports;var r=n[a]={exports:{},id:a,loaded:!1};return e[a].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),a=e[t[0]];return function(e,t,r){a.apply(this,[e,t,r].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(28)},function(e,t){},1,function(e,t){e.exports="

{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},3,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(3),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(16),i=a(r),l=n(17),o=a(l),s=n(14),u=a(s),d=n(18),c=a(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",o.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(4),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(5),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(6),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(21),i=a(r),l=n(20),o=a(l),s=n(22),u=a(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",o.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t,n){var a=function(a,r,i,o){function s(){if(o.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function o(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),r.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),r.$setValidity("kvMap",e)}var d=l.default;n.html(d),t.ngModelCtrl=r,t.removeKeyVal=i,t.addKeyVal=o,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||r.$setViewValue(t.query)}),r.$render=function(){if(r.$viewValue){var e=r.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(10),l=a(i);n(2)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(11),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var o=l.default;a.html(o),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(12),l=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(25),i=a(r),l=n(27),o=a(l);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",o.default).name},[32,13],function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(31),i=a(r),l=n(19),o=a(l),s=n(15),u=a(s),d=n(26),c=a(d),m=n(24),f=a(m),g=n(23),p=a(g),b=n(30),y=a(b);t.default=angular.module("thingsboard.ruleChain.config",[i.default,o.default,u.default,c.default]).directive("tbRelationsQueryConfig",f.default).directive("tbKvMapConfig",p.default).config(y.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){(0,l.default)(t);for(var n in t){var a=t[n];e.translations(n,a)}}r.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(29),l=a(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var l=n(a),o=r(l)}])); +!function(e){function t(a){if(n[a])return n[a].exports;var r=n[a]={exports:{},id:a,loaded:!1};return e[a].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),a=e[t[0]];return function(e,t,r){a.apply(this,[e,t,r].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(34)},function(e,t){},1,1,function(e,t){e.exports="
tb.rulenode.message-count-required
tb.rulenode.min-message-count-message
tb.rulenode.period-seconds-required
tb.rulenode.min-period-seconds-message
tb.rulenode.message-type-required
"},function(e,t){e.exports="
tb.rulenode.default-ttl-required
tb.rulenode.min-default-ttl-message
"},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},6,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.types=t,n.originator=null,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue,n.configuration.originatorId&&n.configuration.originatorType?n.originator={id:n.configuration.originatorId,entityType:n.configuration.originatorType}:n.originator=null,n.$watch("originator",function(e,t){angular.equals(e,t)||(n.originator?(i.$viewValue.originatorId=n.originator.id,i.$viewValue.originatorType=n.originator.entityType):(i.$viewValue.originatorId=null,i.$viewValue.originatorType=null))},!0)},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,n(1);var i=n(4),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(19),i=a(r),o=n(17),l=a(o);t.default=angular.module("thingsboard.ruleChain.config.action",[]).directive("tbActionNodeTelemetryConfig",i.default).directive("tbActionNodeGeneratorConfig",l.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(5),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(6),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(22),i=a(r),o=n(23),l=a(o),s=n(20),u=a(s),d=n(24),c=a(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",l.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(7),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(8),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(9),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(27),i=a(r),o=n(26),l=a(o),s=n(28),u=a(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",l.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t,n){var a=function(a,r,i,l){function s(){if(l.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function l(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),r.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),r.$setValidity("kvMap",e)}var d=o.default;n.html(d),t.ngModelCtrl=r,t.removeKeyVal=i,t.addKeyVal=l,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||r.$setViewValue(t.query)}),r.$render=function(){if(r.$viewValue){var e=r.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(13),o=a(i);n(3)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(14),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(15),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(31),i=a(r),o=n(33),l=a(o);t.default=angular.module("thingsboard.ruleChain.config.transform",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",l.default).name},[38,16],function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(37),i=a(r),o=n(25),l=a(o),s=n(21),u=a(s),d=n(32),c=a(d),m=n(18),g=a(m),f=n(30),p=a(f),b=n(29),y=a(b),v=n(36),h=a(v);t.default=angular.module("thingsboard.ruleChain.config",[i.default,l.default,u.default,c.default,g.default]).directive("tbRelationsQueryConfig",p.default).directive("tbKvMapConfig",y.default).config(h.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){(0,o.default)(t);for(var n in t){var a=t[n];e.translations(n,a)}}r.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(35),o=a(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(a),l=r(o)}])); //# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file diff --git a/ui/src/app/components/details-sidenav.scss b/ui/src/app/components/details-sidenav.scss index c7e991912b..360b1330e4 100644 --- a/ui/src/app/components/details-sidenav.scss +++ b/ui/src/app/components/details-sidenav.scss @@ -59,4 +59,14 @@ md-sidenav.tb-sidenav-details { background-color: $primary-hue-3; } } + + md-tab-content.md-active > div { + height: 100%; + & > *:first-child { + height: 100%; + } + md-content { + height: 100%; + } + } } diff --git a/ui/src/app/components/json-content.directive.js b/ui/src/app/components/json-content.directive.js new file mode 100644 index 0000000000..84f84175be --- /dev/null +++ b/ui/src/app/components/json-content.directive.js @@ -0,0 +1,175 @@ +/* + * Copyright © 2016-2018 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. + */ +import './json-content.scss'; + +import 'brace/ext/language_tools'; +import 'brace/mode/json'; +import 'brace/mode/text'; +import 'ace-builds/src-min-noconflict/snippets/json'; +import 'ace-builds/src-min-noconflict/snippets/text'; + +import fixAceEditor from './ace-editor-fix'; + +/* eslint-disable import/no-unresolved, import/default */ + +import jsonContentTemplate from './json-content.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +export default angular.module('thingsboard.directives.jsonContent', []) + .directive('tbJsonContent', JsonContent) + .name; + +/*@ngInject*/ +function JsonContent($compile, $templateCache, toast, types, utils) { + + var linker = function (scope, element, attrs, ngModelCtrl) { + var template = $templateCache.get(jsonContentTemplate); + element.html(template); + + scope.label = attrs.label; + + scope.validationTriggerArg = attrs.validationTriggerArg; + + scope.contentValid = true; + + scope.json_editor; + + scope.onFullscreenChanged = function () { + updateEditorSize(); + }; + + function updateEditorSize() { + if (scope.json_editor) { + scope.json_editor.resize(); + scope.json_editor.renderer.updateFull(); + } + } + + var mode; + if (scope.contentType) { + mode = types.contentType[scope.contentType].code; + } else { + mode = 'text'; + } + + scope.jsonEditorOptions = { + useWrapMode: true, + mode: mode, + advanced: { + enableSnippets: true, + enableBasicAutocompletion: true, + enableLiveAutocompletion: true + }, + onLoad: function (_ace) { + scope.json_editor = _ace; + scope.json_editor.session.on("change", function () { + scope.cleanupJsonErrors(); + }); + fixAceEditor(_ace); + } + }; + + scope.$watch('contentType', () => { + var mode; + if (scope.contentType) { + mode = types.contentType[scope.contentType].code; + } else { + mode = 'text'; + } + if (scope.json_editor) { + scope.json_editor.session.setMode('ace/mode/' + mode); + } + }); + + scope.cleanupJsonErrors = function () { + toast.hide(); + }; + + scope.updateValidity = function () { + ngModelCtrl.$setValidity('contentBody', scope.contentValid); + }; + + scope.$watch('contentBody', function (newContent, oldContent) { + ngModelCtrl.$setViewValue(scope.contentBody); + if (!angular.equals(newContent, oldContent)) { + scope.contentValid = true; + } + scope.updateValidity(); + }); + + ngModelCtrl.$render = function () { + scope.contentBody = ngModelCtrl.$viewValue; + }; + + scope.showError = function (error) { + var toastParent = angular.element('#tb-json-panel', element); + toast.showError(error, toastParent, 'bottom left'); + }; + + scope.validate = function () { + try { + if (scope.validateContent) { + if (scope.contentType == types.contentType.JSON.value) { + angular.fromJson(scope.contentBody); + } + } + return true; + } catch (e) { + var details = utils.parseException(e); + var errorInfo = 'Error:'; + if (details.name) { + errorInfo += ' ' + details.name + ':'; + } + if (details.message) { + errorInfo += ' ' + details.message; + } + scope.showError(errorInfo); + return false; + } + }; + + scope.$on('form-submit', function (event, args) { + if (!scope.readonly) { + if (!args || scope.validationTriggerArg && scope.validationTriggerArg == args) { + scope.cleanupJsonErrors(); + scope.contentValid = true; + scope.updateValidity(); + scope.contentValid = scope.validate(); + scope.updateValidity(); + } + } + }); + + scope.$on('update-ace-editor-size', function () { + updateEditorSize(); + }); + + $compile(element.contents())(scope); + } + + return { + restrict: "E", + require: "^ngModel", + scope: { + contentType: '=', + validateContent: '=?', + readonly:'=ngReadonly', + fillHeight:'=?' + }, + link: linker + }; +} diff --git a/ui/src/app/components/json-content.scss b/ui/src/app/components/json-content.scss new file mode 100644 index 0000000000..db57451f76 --- /dev/null +++ b/ui/src/app/components/json-content.scss @@ -0,0 +1,35 @@ +/** + * Copyright © 2016-2018 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. + */ +tb-json-content { + position: relative; + .fill-height { + height: 100%; + } +} + +.tb-json-content-panel { + margin-left: 15px; + border: 1px solid #C0C0C0; + height: 100%; + #tb-json-input { + min-width: 200px; + width: 100%; + height: 100%; + &:not(.fill-height) { + min-height: 200px; + } + } +} diff --git a/ui/src/app/components/json-content.tpl.html b/ui/src/app/components/json-content.tpl.html new file mode 100644 index 0000000000..4fad30eaed --- /dev/null +++ b/ui/src/app/components/json-content.tpl.html @@ -0,0 +1,31 @@ + +
+
+ + + +
+
+
+
+
+
diff --git a/ui/src/app/layout/index.js b/ui/src/app/layout/index.js index d397d142c8..6cb9bbd279 100644 --- a/ui/src/app/layout/index.js +++ b/ui/src/app/layout/index.js @@ -30,6 +30,7 @@ import thingsboardOnFinishRender from '../components/finish-render.directive'; import thingsboardSideMenu from '../components/side-menu.directive'; import thingsboardDashboardAutocomplete from '../components/dashboard-autocomplete.directive'; import thingsboardJsonObjectEdit from '../components/json-object-edit.directive'; +import thingsboardJsonContent from '../components/json-content.directive'; import thingsboardUserMenu from './user-menu.directive'; @@ -92,7 +93,8 @@ export default angular.module('thingsboard.home', [ thingsboardOnFinishRender, thingsboardSideMenu, thingsboardDashboardAutocomplete, - thingsboardJsonObjectEdit + thingsboardJsonObjectEdit, + thingsboardJsonContent ]) .config(HomeRoutes) .controller('HomeController', HomeController) From fb934f868f979c601903faacafccef57bf81c537 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 3 Apr 2018 12:20:53 +0300 Subject: [PATCH 55/75] Fix license headers --- .../server/actors/ruleChain/DefaultTbContext.java | 8 ++++---- .../server/controller/TelemetryController.java | 8 ++++---- .../engine/api/RuleEngineTelemetryService.java | 15 +++++++++++++++ .../rule/engine/debug/TbMsgGeneratorNode.java | 8 ++++---- .../rule/engine/telemetry/TbMsgTelemetryNode.java | 8 ++++---- .../TbMsgTelemetryNodeConfiguration.java | 8 ++++---- .../engine/telemetry/TelemetryNodeCallback.java | 15 +++++++++++++++ 7 files changed, 50 insertions(+), 20 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index ae60308833..032689f9e3 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index 25f09cae65..6ff8287b29 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java index 253a2aff24..1ba18cd52f 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; import com.google.common.util.concurrent.FutureCallback; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java index 8739650a17..d319a887d2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java index fc8a9db148..61ca8cfb68 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java index 8d6b7dcf6e..5523926f76 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 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 - *

+ * + * 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. diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java index a7893263c1..fab4942c3f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2018 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.rule.engine.telemetry; import com.google.common.util.concurrent.FutureCallback; From a6661147be560be4693f0d68d633aa14796dd167 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 3 Apr 2018 14:52:37 +0300 Subject: [PATCH 56/75] Update cassandra driver ver. to 3.0.7 --- .../org/thingsboard/server/dao/model/nosql/AuditLogEntity.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AuditLogEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AuditLogEntity.java index ac90cb7085..ab2e3bce2d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AuditLogEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AuditLogEntity.java @@ -36,7 +36,7 @@ import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; -@Table(name = AUDIT_LOG_COLUMN_FAMILY_NAME) +@Table(name = AUDIT_LOG_BY_ENTITY_ID_CF) @Data @NoArgsConstructor public class AuditLogEntity implements BaseEntity { diff --git a/pom.xml b/pom.xml index d09c119c7a..15950ecf1b 100755 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 1.2.3 1.9.5 0.10 - 3.0.0 + 3.0.7 3.0.0.1 1.2.7 18.0 From dc41e63091076c278db36f4f4fb3ff581cc10979 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 3 Apr 2018 15:11:41 +0300 Subject: [PATCH 57/75] Add executor to Access Validator --- .../service/security/AccessValidator.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java index e9bacfdcff..6943940c74 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -50,6 +50,10 @@ import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; import org.thingsboard.server.service.security.model.SecurityUser; import javax.annotation.Nullable; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.function.BiConsumer; /** @@ -83,6 +87,20 @@ public class AccessValidator { @Autowired protected RuleChainService ruleChainService; + private ExecutorService executor; + + @PostConstruct + public void initExecutor() { + executor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (executor != null) { + executor.shutdownNow(); + } + } + public DeferredResult validateEntityAndCallback(SecurityUser currentUser, String entityType, String entityIdStr, BiConsumer, EntityId> onSuccess) throws ThingsboardException { return validateEntityAndCallback(currentUser, entityType, entityIdStr, onSuccess, (result, t) -> handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR)); @@ -162,7 +180,7 @@ public class AccessValidator { return ValidationResult.ok(); } } - })); + }), executor); } } @@ -183,7 +201,7 @@ public class AccessValidator { return ValidationResult.ok(); } } - })); + }), executor); } } @@ -205,7 +223,7 @@ public class AccessValidator { return ValidationResult.ok(); } } - })); + }), executor); } } @@ -226,7 +244,7 @@ public class AccessValidator { return ValidationResult.ok(); } } - })); + }), executor); } } @@ -245,7 +263,7 @@ public class AccessValidator { } else { return ValidationResult.ok(); } - })); + }), executor); } } From 024dd99cb70d663c483460b11e818a6da64279aa Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 4 Apr 2018 11:41:51 +0300 Subject: [PATCH 58/75] Refactor JS Executor. --- .../server/actors/ActorSystemContext.java | 17 +- ...AbstractRuleEngineFlowIntegrationTest.java | 2 +- ...actRuleEngineLifecycleIntegrationTest.java | 2 +- .../thingsboard/server/common/msg/TbMsg.java | 13 +- .../server/common/msg/TbMsgMetaData.java | 2 +- common/message/src/main/proto/tbmsg.proto | 2 +- .../server/dao/queue/QueueBenchmark.java | 2 +- .../impl/CassandraMsgRepositoryTest.java | 6 +- .../rule/engine/debug/TbMsgGeneratorNode.java | 29 ++- .../TbMsgGeneratorNodeConfiguration.java | 10 +- .../rule/engine/filter/TbJsFilterNode.java | 9 +- .../rule/engine/filter/TbJsSwitchNode.java | 11 +- .../rule/engine/js/NashornJsEngine.java | 187 +++++++++++------- .../engine/telemetry/TbMsgTelemetryNode.java | 2 +- .../engine/transform/TbTransformMsgNode.java | 16 +- .../TbTransformMsgNodeConfiguration.java | 2 +- .../static/rulenode/rulenode-core-config.js | 2 +- .../engine/filter/TbJsFilterNodeTest.java | 14 +- .../engine/filter/TbJsSwitchNodeTest.java | 4 +- .../TbGetCustomerAttributeNodeTest.java | 16 +- .../transform/TbChangeOriginatorNodeTest.java | 6 +- .../transform/TbTransformMsgNodeTest.java | 18 +- 22 files changed, 207 insertions(+), 165 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 21bc090c87..147c214a2f 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -321,7 +321,7 @@ public class ActorSystemContext { .put("msgId", tbMsg.getId().toString()) .put("msgType", tbMsg.getType()) .put("dataType", tbMsg.getDataType().name()) - .put("data", convertToString(tbMsg.getDataType(), tbMsg.getData())) + .put("data", tbMsg.getData()) .put("metadata", metadata); if (error != null) { @@ -335,21 +335,6 @@ public class ActorSystemContext { } } - private String convertToString(TbMsgDataType messageType, byte[] data) { - if (data == null) { - return null; - } - switch (messageType) { - case JSON: - case TEXT: - return new String(data, StandardCharsets.UTF_8); - case BINARY: - return Base64Utils.encodeToString(data); - default: - throw new RuntimeException("Message type: " + messageType + " is not supported!"); - } - } - public static Exception toException(Throwable error) { return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); } diff --git a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java index acbace6ae7..f88eb24336 100644 --- a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java @@ -149,7 +149,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule "CUSTOM", device.getId(), new TbMsgMetaData(), - new byte[]{}); + "{}"); actorService.onMsg(new ServiceToRuleEngineMsg(savedTenant.getId(), tbMsg)); Thread.sleep(3000); diff --git a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java index de690a745f..22d79f090f 100644 --- a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java @@ -135,7 +135,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac "CUSTOM", device.getId(), new TbMsgMetaData(), - new byte[]{}); + "{}"); actorService.onMsg(new ServiceToRuleEngineMsg(savedTenant.getId(), tbMsg)); Thread.sleep(3000); diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java index 524cc5fe60..1c7de3bf10 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java @@ -39,9 +39,9 @@ public final class TbMsg implements Serializable { private final EntityId originator; private final TbMsgMetaData metaData; private final TbMsgDataType dataType; - private final byte[] data; + private final String data; - public TbMsg(UUID id, String type, EntityId originator, TbMsgMetaData metaData, byte[] data) { + public TbMsg(UUID id, String type, EntityId originator, TbMsgMetaData metaData, String data) { this.id = id; this.type = type; this.originator = originator; @@ -64,7 +64,7 @@ public final class TbMsg implements Serializable { } builder.setDataType(msg.getDataType().ordinal()); - builder.setData(ByteString.copyFrom(msg.getData())); + builder.setData(msg.getData()); byte[] bytes = builder.build().toByteArray(); return ByteBuffer.wrap(bytes); } @@ -75,16 +75,13 @@ public final class TbMsg implements Serializable { TbMsgMetaData metaData = new TbMsgMetaData(proto.getMetaData().getDataMap()); EntityId entityId = EntityIdFactory.getByTypeAndId(proto.getEntityType(), proto.getEntityId()); TbMsgDataType dataType = TbMsgDataType.values()[proto.getDataType()]; - return new TbMsg(UUID.fromString(proto.getId()), proto.getType(), entityId, metaData, dataType, proto.getData().toByteArray()); + return new TbMsg(UUID.fromString(proto.getId()), proto.getType(), entityId, metaData, dataType, proto.getData()); } catch (InvalidProtocolBufferException e) { throw new IllegalStateException("Could not parse protobuf for TbMsg", e); } } public TbMsg copy() { - int dataSize = data.length; - byte[] dataCopy = new byte[dataSize]; - System.arraycopy( data, 0, dataCopy, 0, data.length ); - return new TbMsg(id, type, originator, metaData.copy(), dataType, dataCopy); + return new TbMsg(id, type, originator, metaData.copy(), dataType, data); } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java index eca153bdfe..ce13e23e17 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java @@ -33,7 +33,7 @@ public final class TbMsgMetaData implements Serializable { private Map data = new ConcurrentHashMap<>(); - TbMsgMetaData(Map data) { + public TbMsgMetaData(Map data) { this.data = data; } diff --git a/common/message/src/main/proto/tbmsg.proto b/common/message/src/main/proto/tbmsg.proto index 62acff20ce..4ce1fb69bc 100644 --- a/common/message/src/main/proto/tbmsg.proto +++ b/common/message/src/main/proto/tbmsg.proto @@ -32,5 +32,5 @@ message TbMsgProto { TbMsgMetaDataProto metaData = 5; int32 dataType = 6; - bytes data = 7; + string data = 7; } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java index bb76b97b18..85f42ae169 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java +++ b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueBenchmark.java @@ -126,7 +126,7 @@ public class QueueBenchmark implements CommandLineRunner { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("key", "value"); String dataStr = "someContent"; - return new TbMsg(UUIDs.timeBased(), "type", null, metaData, TbMsgDataType.JSON, dataStr.getBytes()); + return new TbMsg(UUIDs.timeBased(), "type", null, metaData, TbMsgDataType.JSON, dataStr); } @Bean diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java index 99c6a91f84..a766aa48ce 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/queue/cassandra/repository/impl/CassandraMsgRepositoryTest.java @@ -45,7 +45,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { @Test public void msgCanBeSavedAndRead() throws ExecutionException, InterruptedException { - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, "0000"); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 1L, 1L, 1L); future.get(); @@ -55,7 +55,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { @Test public void expiredMsgsAreNotReturned() throws ExecutionException, InterruptedException { - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), null, TbMsgDataType.JSON, "0000"); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 2L, 2L, 2L); future.get(); @@ -68,7 +68,7 @@ public class CassandraMsgRepositoryTest extends AbstractServiceTest { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("key", "value"); String dataStr = "someContent"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), metaData, TbMsgDataType.JSON, dataStr.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "type", new DeviceId(UUIDs.timeBased()), metaData, TbMsgDataType.JSON, dataStr); UUID nodeId = UUIDs.timeBased(); ListenableFuture future = msgRepository.save(msg, nodeId, 1L, 1L, 1L); future.get(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java index d319a887d2..857baf6785 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -16,6 +16,7 @@ package org.thingsboard.rule.engine.debug; import com.datastax.driver.core.utils.UUIDs; +import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; import org.thingsboard.rule.engine.TbNodeUtils; @@ -58,9 +59,11 @@ public class TbMsgGeneratorNode implements TbNode { public static final String TB_MSG_GENERATOR_NODE_MSG = "TbMsgGeneratorNodeMsg"; private TbMsgGeneratorNodeConfiguration config; + private NashornJsEngine jsEngine; private long delay; private EntityId originatorId; private UUID nextTickId; + private TbMsg prevMsg; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { @@ -71,29 +74,41 @@ public class TbMsgGeneratorNode implements TbNode { } else { originatorId = ctx.getSelfId(); } + this.jsEngine = new NashornJsEngine(config.getJsScript(), "Generate", "prevMsg", "prevMetadata", "prevMsgType"); sentTickMsg(ctx); } @Override public void onMsg(TbContext ctx, TbMsg msg) { if (msg.getType().equals(TB_MSG_GENERATOR_NODE_MSG) && msg.getId().equals(nextTickId)) { - TbMsgMetaData metaData = new TbMsgMetaData(); - if (config.getMsgMetaData() != null) { - config.getMsgMetaData().forEach(metaData::putValue); - } - ctx.tellNext(new TbMsg(UUIDs.timeBased(), config.getMsgType(), originatorId, metaData, config.getMsgBody().getBytes(StandardCharsets.UTF_8))); - sentTickMsg(ctx); + withCallback(generate(ctx), + m -> {ctx.tellNext(m); sentTickMsg(ctx);}, + t -> {ctx.tellError(msg, t); sentTickMsg(ctx);}); } } private void sentTickMsg(TbContext ctx) { - TbMsg tickMsg = new TbMsg(UUIDs.timeBased(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), new byte[]{}); + TbMsg tickMsg = new TbMsg(UUIDs.timeBased(), TB_MSG_GENERATOR_NODE_MSG, ctx.getSelfId(), new TbMsgMetaData(), ""); nextTickId = tickMsg.getId(); ctx.tellSelf(tickMsg, delay); } + protected ListenableFuture generate(TbContext ctx) { + return ctx.getJsExecutor().executeAsync(() -> { + if (prevMsg == null) { + prevMsg = new TbMsg(UUIDs.timeBased(), "", originatorId, new TbMsgMetaData(), "{}"); + } + TbMsg generated = jsEngine.executeGenerate(prevMsg); + prevMsg = new TbMsg(UUIDs.timeBased(), generated.getType(), originatorId, generated.getMetaData(), generated.getData()); + return prevMsg; + }); + } @Override public void destroy() { + prevMsg = null; + if (jsEngine != null) { + jsEngine.destroy(); + } } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java index 8eb37a2aef..c568e3dd94 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeConfiguration.java @@ -28,17 +28,17 @@ public class TbMsgGeneratorNodeConfiguration implements NodeConfiguration msgMetaData; + private String jsScript; @Override public TbMsgGeneratorNodeConfiguration defaultConfiguration() { TbMsgGeneratorNodeConfiguration configuration = new TbMsgGeneratorNodeConfiguration(); configuration.setMsgCount(0); configuration.setPeriodInSeconds(1); - configuration.setMsgType("DebugMsg"); - configuration.setMsgBody("{}"); + configuration.setJsScript("var msg = { temp: 42, humidity: 77 };\n" + + "var metadata = { data: 40 };\n" + + "var msgType = \"DebugMsg\";\n\n" + + "return { msg: msg, metadata: metadata, msgType: msgType };"); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index 044a8b866d..72074f9096 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -35,7 +35,8 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDetails = "Evaluate incoming Message with configured JS condition. " + "If True - send Message via True chain, otherwise False chain is used." + "Message payload can be accessed via msg property. For example msg.temperature < 10;" + - "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';", + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';" + + "Message type can be accessed via msgType property.", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbFilterNodeScriptConfig") @@ -53,15 +54,11 @@ public class TbJsFilterNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) { ListeningExecutor jsExecutor = ctx.getJsExecutor(); - withCallback(jsExecutor.executeAsync(() -> jsEngine.executeFilter(toBindings(msg))), + withCallback(jsExecutor.executeAsync(() -> jsEngine.executeFilter(msg)), filterResult -> ctx.tellNext(msg, Boolean.toString(filterResult)), t -> ctx.tellError(msg, t)); } - private Bindings toBindings(TbMsg msg) { - return NashornJsEngine.bindMsg(msg); - } - @Override public void destroy() { if (jsEngine != null) { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index d04b58a4d5..7996ae7a03 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -36,7 +36,8 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + "If Array is empty - message not routed to next Node. " + "Message payload can be accessed via msg property. For example msg.temperature < 10; " + - "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';", + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';" + + "Message type can be accessed via msgType property.", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbFilterNodeSwitchConfig") public class TbJsSwitchNode implements TbNode { @@ -53,7 +54,7 @@ public class TbJsSwitchNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) { ListeningExecutor jsExecutor = ctx.getJsExecutor(); - withCallback(jsExecutor.executeAsync(() -> jsEngine.executeSwitch(toBindings(msg))), + withCallback(jsExecutor.executeAsync(() -> jsEngine.executeSwitch(msg)), result -> processSwitch(ctx, msg, result), t -> ctx.tellError(msg, t)); } @@ -62,11 +63,7 @@ public class TbJsSwitchNode implements TbNode { ctx.tellNext(msg, nextRelations); } - private Bindings toBindings(TbMsg msg) { - return NashornJsEngine.bindMsg(msg); - } - - @Override + @Override public void destroy() { if (jsEngine != null) { jsEngine.destroy(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java index a4add405e7..ecca1c6a89 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -16,6 +16,7 @@ package org.thingsboard.rule.engine.js; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; @@ -23,9 +24,13 @@ import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import jdk.nashorn.api.scripting.ScriptObjectMirror; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; import javax.script.*; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -34,112 +39,158 @@ import java.util.Set; @Slf4j public class NashornJsEngine { + + public static final String MSG = "msg"; public static final String METADATA = "metadata"; - public static final String DATA = "msg"; + public static final String MSG_TYPE = "msgType"; - private static final String JS_WRAPPER_PREFIX_TEMPLATE = "function %s(msg, metadata) { "; - private static final String JS_WRAPPER_SUFFIX_TEMPLATE = "}\n %s(msg, metadata);"; + private static final String JS_WRAPPER_PREFIX_TEMPLATE = "function %s(msgStr, metadataStr, msgType) { " + + " var msg = JSON.parse(msgStr); " + + " var metadata = JSON.parse(metadataStr); " + + " return JSON.stringify(%s(msg, metadata, msgType));" + + " function %s(%s, %s, %s) {"; + private static final String JS_WRAPPER_SUFFIX = "}" + + "\n}"; + private static final ObjectMapper mapper = new ObjectMapper(); private static NashornScriptEngineFactory factory = new NashornScriptEngineFactory(); - - private CompiledScript engine; - - public NashornJsEngine(String script, String functionName) { - String jsWrapperPrefix = String.format(JS_WRAPPER_PREFIX_TEMPLATE, functionName); - String jsWrapperSuffix = String.format(JS_WRAPPER_SUFFIX_TEMPLATE, functionName); - engine = compileScript(jsWrapperPrefix + script + jsWrapperSuffix); + private static ScriptEngine engine = factory.getScriptEngine(new String[]{"--no-java"}); + + private final String invokeFunctionName; + + public NashornJsEngine(String script, String functionName, String... argNames) { + this.invokeFunctionName = "invokeInternal" + this.hashCode(); + String msgArg; + String metadataArg; + String msgTypeArg; + if (argNames != null && argNames.length == 3) { + msgArg = argNames[0]; + metadataArg = argNames[1]; + msgTypeArg = argNames[2]; + } else { + msgArg = MSG; + metadataArg = METADATA; + msgTypeArg = MSG_TYPE; + } + String jsWrapperPrefix = String.format(JS_WRAPPER_PREFIX_TEMPLATE, this.invokeFunctionName, + functionName, functionName, msgArg, metadataArg, msgTypeArg); + compileScript(jsWrapperPrefix + script + JS_WRAPPER_SUFFIX); } - private static CompiledScript compileScript(String script) { - ScriptEngine engine = factory.getScriptEngine(new String[]{"--no-java"}); - Compilable compEngine = (Compilable) engine; + private static void compileScript(String script) { try { - return compEngine.compile(script); + engine.eval(script); } catch (ScriptException e) { log.warn("Failed to compile JS script: {}", e.getMessage(), e); throw new IllegalArgumentException("Can't compile script: " + e.getMessage()); } } - public static Bindings bindMsg(TbMsg msg) { + private static String[] prepareArgs(TbMsg msg) { try { - Bindings bindings = new SimpleBindings(); - if (ArrayUtils.isNotEmpty(msg.getData())) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(msg.getData()); - Map map = mapper.treeToValue(jsonNode, Map.class); - bindings.put(DATA, map); + String[] args = new String[3]; + if (msg.getData() != null) { + args[0] = msg.getData(); } else { - bindings.put(DATA, Collections.emptyMap()); + args[0] = ""; } - bindings.put(METADATA, msg.getMetaData().getData()); - return bindings; + args[1] = mapper.writeValueAsString(msg.getMetaData().getData()); + args[2] = msg.getType(); + return args; } catch (Throwable th) { throw new IllegalArgumentException("Cannot bind js args", th); } } - private static TbMsg unbindMsg(Bindings bindings, TbMsg msg) throws JsonProcessingException { - for (Map.Entry entry : msg.getMetaData().getData().entrySet()) { - Object obj = entry.getValue(); - entry.setValue(obj.toString()); + private static TbMsg unbindMsg(JsonNode msgData, TbMsg msg) { + try { + String data = null; + Map metadata = null; + String messageType = null; + if (msgData.has(MSG)) { + JsonNode msgPayload = msgData.get(MSG); + data = mapper.writeValueAsString(msgPayload); + } + if (msgData.has(METADATA)) { + JsonNode msgMetadata = msgData.get(METADATA); + metadata = mapper.convertValue(msgMetadata, new TypeReference>() { + }); + } + if (msgData.has(MSG_TYPE)) { + messageType = msgData.get(MSG_TYPE).asText(); + } + String newData = data != null ? data : msg.getData(); + TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData(); + String newMessageType = !StringUtils.isEmpty(messageType) ? messageType : msg.getType(); + return new TbMsg(msg.getId(), newMessageType, msg.getOriginator(), newMetadata, newData); + } catch (Throwable th) { + th.printStackTrace(); + throw new RuntimeException("Failed to unbind message data from javascript result", th); } + } - Object payload = bindings.get(DATA); - if (payload != null) { - ObjectMapper mapper = new ObjectMapper(); - byte[] bytes = mapper.writeValueAsBytes(payload); - return new TbMsg(msg.getId(), msg.getType(), msg.getOriginator(), msg.getMetaData(), bytes); + public TbMsg executeUpdate(TbMsg msg) throws ScriptException { + JsonNode result = executeScript(msg); + if (!result.isObject()) { + log.warn("Wrong result type: {}", result.getNodeType()); + throw new ScriptException("Wrong result type: " + result.getNodeType()); } - - return msg; + return unbindMsg(result, msg); } - public TbMsg executeUpdate(Bindings bindings, TbMsg msg) throws ScriptException { - try { - engine.eval(bindings); - return unbindMsg(bindings, msg); - } catch (Throwable th) { - th.printStackTrace(); - throw new IllegalArgumentException("Cannot unbind js args", th); + public TbMsg executeGenerate(TbMsg prevMsg) throws ScriptException { + JsonNode result = executeScript(prevMsg); + if (!result.isObject()) { + log.warn("Wrong result type: {}", result.getNodeType()); + throw new ScriptException("Wrong result type: " + result.getNodeType()); } + return unbindMsg(result, prevMsg); } - public boolean executeFilter(Bindings bindings) throws ScriptException { - Object eval = engine.eval(bindings); - if (eval instanceof Boolean) { - return (boolean) eval; - } else { - log.warn("Wrong result type: {}", eval); - throw new ScriptException("Wrong result type: " + eval); + public boolean executeFilter(TbMsg msg) throws ScriptException { + JsonNode result = executeScript(msg); + if (!result.isBoolean()) { + log.warn("Wrong result type: {}", result.getNodeType()); + throw new ScriptException("Wrong result type: " + result.getNodeType()); } + return result.asBoolean(); } - public Set executeSwitch(Bindings bindings) throws ScriptException, NoSuchMethodException { - Object eval = this.engine.eval(bindings); - if (eval instanceof String) { - return Collections.singleton((String) eval); - } else if (eval instanceof ScriptObjectMirror) { - ScriptObjectMirror mir = (ScriptObjectMirror) eval; - if (mir.isArray()) { - Set nextStates = Sets.newHashSet(); - for (Map.Entry entry : mir.entrySet()) { - if (entry.getValue() instanceof String) { - nextStates.add((String) entry.getValue()); - } else { - log.warn("Wrong result type: {}", eval); - throw new ScriptException("Wrong result type: " + eval); - } + public Set executeSwitch(TbMsg msg) throws ScriptException, NoSuchMethodException { + JsonNode result = executeScript(msg); + if (result.isTextual()) { + return Collections.singleton(result.asText()); + } else if (result.isArray()) { + Set nextStates = Sets.newHashSet(); + for (JsonNode val : result) { + if (!val.isTextual()) { + log.warn("Wrong result type: {}", val.getNodeType()); + throw new ScriptException("Wrong result type: " + val.getNodeType()); + } else { + nextStates.add(val.asText()); } - return nextStates; } + return nextStates; + } else { + log.warn("Wrong result type: {}", result.getNodeType()); + throw new ScriptException("Wrong result type: " + result.getNodeType()); } + } - log.warn("Wrong result type: {}", eval); - throw new ScriptException("Wrong result type: " + eval); + private JsonNode executeScript(TbMsg msg) throws ScriptException { + try { + String[] inArgs = prepareArgs(msg); + String eval = ((Invocable)engine).invokeFunction(this.invokeFunctionName, inArgs[0], inArgs[1], inArgs[2]).toString(); + return mapper.readTree(eval); + } catch (ScriptException | IllegalArgumentException th) { + throw th; + } catch (Throwable th) { + th.printStackTrace(); + throw new RuntimeException("Failed to execute js script", th); + } } public void destroy() { - engine = null; + //engine = null; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java index 61ca8cfb68..0e6687fabf 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java @@ -64,7 +64,7 @@ public class TbMsgTelemetryNode implements TbNode { return; } - String src = new String(msg.getData(), StandardCharsets.UTF_8); + String src = msg.getData(); TelemetryUploadRequest telemetryUploadRequest = JsonConverter.convertToTelemetry(new JsonParser().parse(src)); Map> tsKvMap = telemetryUploadRequest.getData(); if (tsKvMap == null) { diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index 626d05784a..f57edba753 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -28,10 +28,14 @@ import javax.script.Bindings; type = ComponentType.TRANSFORMATION, name = "script", configClazz = TbTransformMsgNodeConfiguration.class, - nodeDescription = "Change Message payload and Metadata using JavaScript", - nodeDetails = "JavaScript function recieve 2 input parameters that can be changed inside.
" + + nodeDescription = "Change Message payload, Metadata or Message type using JavaScript", + nodeDetails = "JavaScript function receive 3 input parameters.
" + "metadata - is a Message metadata.
" + - "msg - is a Message payload.
Any properties can be changed/removed/added in those objects.", + "msg - is a Message payload.
" + + "msgType - is a Message type.
" + + "Should return the following structure:
" + + "{ msg: , metadata: , msgType: }" + + "All fields in resulting object are optional and will be taken from original message if not specified.", uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, configDirective = "tbTransformationNodeScriptConfig") public class TbTransformMsgNode extends TbAbstractTransformNode { @@ -48,11 +52,7 @@ public class TbTransformMsgNode extends TbAbstractTransformNode { @Override protected ListenableFuture transform(TbContext ctx, TbMsg msg) { - return ctx.getJsExecutor().executeAsync(() -> jsEngine.executeUpdate(toBindings(msg), msg)); - } - - private Bindings toBindings(TbMsg msg) { - return NashornJsEngine.bindMsg(msg); + return ctx.getJsExecutor().executeAsync(() -> jsEngine.executeUpdate(msg)); } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java index 09d5ac43ad..a710cf8578 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java @@ -27,7 +27,7 @@ public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguratio public TbTransformMsgNodeConfiguration defaultConfiguration() { TbTransformMsgNodeConfiguration configuration = new TbTransformMsgNodeConfiguration(); configuration.setStartNewChain(false); - configuration.setJsScript("return msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine' "); + configuration.setJsScript("return {msg: msg, metadata: metadata, msgType: msgType};"); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index 62a0ff56f2..79006c2c72 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(a){if(n[a])return n[a].exports;var r=n[a]={exports:{},id:a,loaded:!1};return e[a].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),a=e[t[0]];return function(e,t,r){a.apply(this,[e,t,r].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(34)},function(e,t){},1,1,function(e,t){e.exports="

tb.rulenode.message-count-required
tb.rulenode.min-message-count-message
tb.rulenode.period-seconds-required
tb.rulenode.min-period-seconds-message
tb.rulenode.message-type-required
"},function(e,t){e.exports="
tb.rulenode.default-ttl-required
tb.rulenode.min-default-ttl-message
"},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},6,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.types=t,n.originator=null,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue,n.configuration.originatorId&&n.configuration.originatorType?n.originator={id:n.configuration.originatorId,entityType:n.configuration.originatorType}:n.originator=null,n.$watch("originator",function(e,t){angular.equals(e,t)||(n.originator?(i.$viewValue.originatorId=n.originator.id,i.$viewValue.originatorType=n.originator.entityType):(i.$viewValue.originatorId=null,i.$viewValue.originatorType=null))},!0)},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r,n(1);var i=n(4),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(19),i=a(r),o=n(17),l=a(o);t.default=angular.module("thingsboard.ruleChain.config.action",[]).directive("tbActionNodeTelemetryConfig",i.default).directive("tbActionNodeGeneratorConfig",l.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(5),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(6),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(22),i=a(r),o=n(23),l=a(o),s=n(20),u=a(s),d=n(24),c=a(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",l.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(7),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(8),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e){var t=function(t,n,a,r){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(9),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(27),i=a(r),o=n(26),l=a(o),s=n(28),u=a(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",l.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t,n){var a=function(a,r,i,l){function s(){if(l.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function l(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),r.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),r.$setValidity("kvMap",e)}var d=o.default;n.html(d),t.ngModelCtrl=r,t.removeKeyVal=i,t.addKeyVal=l,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||r.$setViewValue(t.query)}),r.$render=function(){if(r.$viewValue){var e=r.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}r.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(13),o=a(i);n(3)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(14),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=function(n,a,r,i){var l=o.default;a.html(l),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(a.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}r.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(15),o=a(i)},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(31),i=a(r),o=n(33),l=a(o);t.default=angular.module("thingsboard.ruleChain.config.transform",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",l.default).name},[38,16],function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var r=n(37),i=a(r),o=n(25),l=a(o),s=n(21),u=a(s),d=n(32),c=a(d),m=n(18),g=a(m),f=n(30),p=a(f),b=n(29),y=a(b),v=n(36),h=a(v);t.default=angular.module("thingsboard.ruleChain.config",[i.default,l.default,u.default,c.default,g.default]).directive("tbRelationsQueryConfig",p.default).directive("tbKvMapConfig",y.default).config(h.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function r(e,t){(0,o.default)(t);for(var n in t){var a=t[n];e.translations(n,a)}}r.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var i=n(35),o=a(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,a){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,a,r){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||r.$setViewValue(t.configuration)}),r.$render=function(){t.configuration=r.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(a),l=r(o)}])); +!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),r=e[t[0]];return function(e,t,a){r.apply(this,[e,t,a].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(34)},function(e,t){},1,1,function(e,t){e.exports="
tb.rulenode.message-count-required
tb.rulenode.min-message-count-message
tb.rulenode.period-seconds-required
tb.rulenode.min-period-seconds-message
"},function(e,t){e.exports="
tb.rulenode.default-ttl-required
tb.rulenode.min-default-ttl-message
"},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},6,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.types=t,n.originator=null,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue,n.configuration.originatorId&&n.configuration.originatorType?n.originator={id:n.configuration.originatorId,entityType:n.configuration.originatorType}:n.originator=null,n.$watch("originator",function(e,t){angular.equals(e,t)||(n.originator?(i.$viewValue.originatorId=n.originator.id,i.$viewValue.originatorType=n.originator.entityType):(i.$viewValue.originatorId=null,i.$viewValue.originatorType=null))},!0)},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a,n(1);var i=n(4),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(19),i=r(a),o=n(17),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.action",[]).directive("tbActionNodeTelemetryConfig",i.default).directive("tbActionNodeGeneratorConfig",l.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(5),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(6),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(22),i=r(a),o=n(23),l=r(o),s=n(20),u=r(s),d=n(24),c=r(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",l.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(7),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(8),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(9),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(27),i=r(a),o=n(26),l=r(o),s=n(28),u=r(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",l.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t,n){var r=function(r,a,i,l){function s(){if(l.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function l(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),a.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),a.$setValidity("kvMap",e)}var d=o.default;n.html(d),t.ngModelCtrl=a,t.removeKeyVal=i,t.addKeyVal=l,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||a.$setViewValue(t.query)}),a.$render=function(){if(a.$viewValue){var e=a.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(13),o=r(i);n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(14),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(15),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(31),i=r(a),o=n(33),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.transform",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",l.default).name},[38,16],function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(37),i=r(a),o=n(25),l=r(o),s=n(21),u=r(s),d=n(32),c=r(d),m=n(18),g=r(m),f=n(30),p=r(f),b=n(29),v=r(b),y=n(36),h=r(y);t.default=angular.module("thingsboard.ruleChain.config",[i.default,l.default,u.default,c.default,g.default]).directive("tbRelationsQueryConfig",p.default).directive("tbKvMapConfig",v.default).config(h.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){(0,o.default)(t);for(var n in t){var r=t[n];e.translations(n,r)}}a.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(35),o=r(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,r){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,r,a){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(r),l=a(o)}])); //# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java index de9d9c4e45..34232b2434 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -52,7 +52,7 @@ public class TbJsFilterNodeTest { @Test public void falseEvaluationDoNotSendMsg() throws TbNodeException { initWithScript("return 10 > 15;"); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}".getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), "{}"); mockJsExecutor(); @@ -65,7 +65,7 @@ public class TbJsFilterNodeTest { @Test public void notValidMsgDataThrowsException() throws TbNodeException { initWithScript("return 10 > 15;"); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, new TbMsgMetaData(), new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, null, "{}"); when(ctx.getJsExecutor()).thenReturn(executor); @@ -79,11 +79,11 @@ public class TbJsFilterNodeTest { public void exceptionInJsThrowsException() throws TbNodeException { initWithScript("return metadata.temp.curr < 15;"); TbMsgMetaData metaData = new TbMsgMetaData(); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}"); mockJsExecutor(); node.onMsg(ctx, msg); - String expectedMessage = "TypeError: Cannot get property \"curr\" of null in at line number 1"; + String expectedMessage = "TypeError: Cannot read property \"curr\" from undefined in at line number 1"; verifyError(msg, expectedMessage, ScriptException.class); } @@ -98,7 +98,7 @@ public class TbJsFilterNodeTest { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}"); mockJsExecutor(); node.onMsg(ctx, msg); @@ -113,7 +113,7 @@ public class TbJsFilterNodeTest { TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "10"); metaData.putValue("humidity", "99"); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}".getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, "{}"); mockJsExecutor(); node.onMsg(ctx, msg); @@ -129,7 +129,7 @@ public class TbJsFilterNodeTest { metaData.putValue("humidity", "99"); String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index f1f2d73259..a4ea56cab2 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -68,7 +68,7 @@ public class TbJsSwitchNodeTest { metaData.putValue("humidity", "99"); String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); @@ -92,7 +92,7 @@ public class TbJsSwitchNodeTest { metaData.putValue("humidity", "99"); String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index 2218749af5..e26312b7ca 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -98,7 +98,7 @@ public class TbGetCustomerAttributeNodeTest { User user = new User(); user.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), "{}"); when(ctx.getUserService()).thenReturn(userService); when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); @@ -123,7 +123,7 @@ public class TbGetCustomerAttributeNodeTest { User user = new User(); user.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), "{}"); when(ctx.getUserService()).thenReturn(userService); when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); @@ -148,7 +148,7 @@ public class TbGetCustomerAttributeNodeTest { User user = new User(); user.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), "{}"); when(ctx.getUserService()).thenReturn(userService); when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(null)); @@ -166,7 +166,7 @@ public class TbGetCustomerAttributeNodeTest { @Test public void customerAttributeAddedInMetadata() { CustomerId customerId = new CustomerId(UUIDs.timeBased()); - msg = new TbMsg(UUIDs.timeBased(), "CUSTOMER", customerId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "CUSTOMER", customerId, new TbMsgMetaData(), "{}"); entityAttributeFetched(customerId); } @@ -177,7 +177,7 @@ public class TbGetCustomerAttributeNodeTest { User user = new User(); user.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), "{}"); when(ctx.getUserService()).thenReturn(userService); when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user)); @@ -192,7 +192,7 @@ public class TbGetCustomerAttributeNodeTest { Asset asset = new Asset(); asset.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", assetId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", assetId, new TbMsgMetaData(), "{}"); when(ctx.getAssetService()).thenReturn(assetService); when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); @@ -207,7 +207,7 @@ public class TbGetCustomerAttributeNodeTest { Device device = new Device(); device.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), "{}"); when(ctx.getDeviceService()).thenReturn(deviceService); when(deviceService.findDeviceByIdAsync(deviceId)).thenReturn(Futures.immediateFuture(device)); @@ -234,7 +234,7 @@ public class TbGetCustomerAttributeNodeTest { Device device = new Device(); device.setCustomerId(customerId); - msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), new byte[4]); + msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), "{}"); when(ctx.getDeviceService()).thenReturn(deviceService); when(deviceService.findDeviceByIdAsync(deviceId)).thenReturn(Futures.immediateFuture(device)); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java index 39e0121e53..1b66433085 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java @@ -57,7 +57,7 @@ public class TbChangeOriginatorNodeTest { Asset asset = new Asset(); asset.setCustomerId(customerId); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), "{}"); when(ctx.getAssetService()).thenReturn(assetService); when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); @@ -78,7 +78,7 @@ public class TbChangeOriginatorNodeTest { Asset asset = new Asset(); asset.setCustomerId(customerId); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), "{}"); when(ctx.getAssetService()).thenReturn(assetService); when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset)); @@ -99,7 +99,7 @@ public class TbChangeOriginatorNodeTest { Asset asset = new Asset(); asset.setCustomerId(customerId); - TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), new byte[4]); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "ASSET", assetId, new TbMsgMetaData(), "{}"); when(ctx.getAssetService()).thenReturn(assetService); when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFailedFuture(new IllegalStateException("wrong"))); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java index 46be7f8cb4..579392cec7 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -51,13 +51,13 @@ public class TbTransformMsgNodeTest { @Test public void metadataCanBeUpdated() throws TbNodeException { - initWithScript("return metadata.temp = metadata.temp * 10;"); + initWithScript("metadata.temp = metadata.temp * 10; return {metadata: metadata};"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); @@ -65,18 +65,18 @@ public class TbTransformMsgNodeTest { ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellNext(captor.capture()); TbMsg actualMsg = captor.getValue(); - assertEquals("70.0", actualMsg.getMetaData().getValue("temp")); + assertEquals("70", actualMsg.getMetaData().getValue("temp")); } @Test public void metadataCanBeAdded() throws TbNodeException { - initWithScript("return metadata.newAttr = metadata.humidity - msg.passed;"); + initWithScript("metadata.newAttr = metadata.humidity - msg.passed; return {metadata: metadata};"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); @@ -84,18 +84,18 @@ public class TbTransformMsgNodeTest { ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellNext(captor.capture()); TbMsg actualMsg = captor.getValue(); - assertEquals("94.0", actualMsg.getMetaData().getValue("newAttr")); + assertEquals("94", actualMsg.getMetaData().getValue("newAttr")); } @Test public void payloadCanBeUpdated() throws TbNodeException { - initWithScript("msg.passed = msg.passed * metadata.temp; return msg.bigObj.newProp = 'Ukraine' "); + initWithScript("msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine'; return {msg: msg};"); TbMsgMetaData metaData = new TbMsgMetaData(); metaData.putValue("temp", "7"); metaData.putValue("humidity", "99"); String rawJson = "{\"name\":\"Vit\",\"passed\": 5,\"bigObj\":{\"prop\":42}}"; - TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson.getBytes()); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); mockJsExecutor(); node.onMsg(ctx, msg); @@ -103,7 +103,7 @@ public class TbTransformMsgNodeTest { ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellNext(captor.capture()); TbMsg actualMsg = captor.getValue(); - String expectedJson = "{\"name\":\"Vit\",\"passed\":35.0,\"bigObj\":{\"prop\":42,\"newProp\":\"Ukraine\"}}"; + String expectedJson = "{\"name\":\"Vit\",\"passed\":35,\"bigObj\":{\"prop\":42,\"newProp\":\"Ukraine\"}}"; assertEquals(expectedJson, new String(actualMsg.getData())); } From 5b03e45fcbec4d2f33dda2609b6b1374483972a0 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 4 Apr 2018 20:22:39 +0300 Subject: [PATCH 59/75] Relations cache fix. --- .../dao/relation/BaseRelationService.java | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java index 370d770188..836bd3d314 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java @@ -211,9 +211,9 @@ public class BaseRelationService implements RelationService { private void checkFromDeleteSync(Cache cache, List results, EntityRelation relation, boolean isRemove) { if (isRemove) { results.add(relationDao.deleteRelation(relation)); - cacheEviction(relation, relation.getTo(), cache); + cacheEviction(relation, false, cache); } else { - cacheEviction(relation, relation.getFrom(), cache); + cacheEviction(relation, true, cache); } } @@ -262,25 +262,43 @@ public class BaseRelationService implements RelationService { private void checkFromDeleteAsync(Cache cache, List> results, EntityRelation relation, boolean isRemove) { if (isRemove) { results.add(relationDao.deleteRelationAsync(relation)); - cacheEviction(relation, relation.getTo(), cache); + cacheEviction(relation, false, cache); } else { - cacheEviction(relation, relation.getFrom(), cache); + cacheEviction(relation, true, cache); } } - private void cacheEviction(EntityRelation relation, EntityId entityId, Cache cache) { - cache.evict(entityId); - - List toAndType = new ArrayList<>(); - toAndType.add(entityId); - toAndType.add(relation.getType()); - cache.evict(toAndType); - - List fromToAndType = new ArrayList<>(); - fromToAndType.add(relation.getFrom()); - fromToAndType.add(relation.getTo()); - fromToAndType.add(relation.getType()); - cache.evict(fromToAndType); + private void cacheEviction(EntityRelation relation, boolean outboundOnly, Cache cache) { + List fromToTypeAndTypeGroup = new ArrayList<>(); + fromToTypeAndTypeGroup.add(relation.getFrom()); + fromToTypeAndTypeGroup.add(relation.getTo()); + fromToTypeAndTypeGroup.add(relation.getType()); + fromToTypeAndTypeGroup.add(relation.getTypeGroup()); + cache.evict(fromToTypeAndTypeGroup); + + List fromTypeAndTypeGroup = new ArrayList<>(); + fromTypeAndTypeGroup.add(relation.getFrom()); + fromTypeAndTypeGroup.add(relation.getType()); + fromTypeAndTypeGroup.add(relation.getTypeGroup()); + cache.evict(fromTypeAndTypeGroup); + + List fromAndTypeGroup = new ArrayList<>(); + fromAndTypeGroup.add(relation.getFrom()); + fromAndTypeGroup.add(relation.getTypeGroup()); + cache.evict(fromAndTypeGroup); + + if (!outboundOnly) { + List toAndTypeGroup = new ArrayList<>(); + toAndTypeGroup.add(relation.getTo()); + toAndTypeGroup.add(relation.getTypeGroup()); + cache.evict(toAndTypeGroup); + + List toTypeAndTypeGroup = new ArrayList<>(); + fromTypeAndTypeGroup.add(relation.getTo()); + fromTypeAndTypeGroup.add(relation.getType()); + fromTypeAndTypeGroup.add(relation.getTypeGroup()); + cache.evict(toTypeAndTypeGroup); + } } @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}") From ecf54464a81759370157157ade9513207761ac8d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 4 Apr 2018 21:36:37 +0300 Subject: [PATCH 60/75] Update rule node ctx on update --- .../server/actors/ruleChain/DefaultTbContext.java | 6 ++++++ .../ruleChain/RuleChainActorMessageProcessor.java | 7 ++++--- .../ruleChain/RuleNodeActorMessageProcessor.java | 1 + .../server/actors/ruleChain/RuleNodeCtx.java | 4 +++- .../org/thingsboard/rule/engine/api/TbContext.java | 12 +++--------- .../rule/engine/filter/TbJsFilterNode.java | 4 ++-- .../rule/engine/filter/TbJsSwitchNode.java | 4 ++-- .../rule/engine/transform/TbTransformMsgNode.java | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 032689f9e3..03dc376f10 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -23,6 +23,7 @@ import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.alarm.AlarmService; @@ -106,6 +107,11 @@ class DefaultTbContext implements TbContext { nodeCtx.getSelfActor().tell(new RuleNodeToSelfErrorMsg(msg, th), nodeCtx.getSelfActor()); } + @Override + public void updateSelf(RuleNode self) { + nodeCtx.setSelf(self); + } + @Override public RuleNodeId getSelfId() { return nodeCtx.getSelf().getId(); diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java index a853b1576b..d588a63637 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -92,6 +92,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessorTrue - send Message via True chain, otherwise False chain is used." + - "Message payload can be accessed via msg property. For example msg.temperature < 10;" + - "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';" + + "Message payload can be accessed via msg property. For example msg.temperature < 10;
" + + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';
" + "Message type can be accessed via msgType property.", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbFilterNodeScriptConfig") diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 7996ae7a03..0a96fab31f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -35,8 +35,8 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; nodeDescription = "Route incoming Message to one or multiple output chains", nodeDetails = "Node executes configured JS script. Script should return array of next Chain names where Message should be routed. " + "If Array is empty - message not routed to next Node. " + - "Message payload can be accessed via msg property. For example msg.temperature < 10; " + - "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';" + + "Message payload can be accessed via msg property. For example msg.temperature < 10;
" + + "Message metadata can be accessed via metadata property. For example metadata.customerName === 'John';
" + "Message type can be accessed via msgType property.", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbFilterNodeSwitchConfig") diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index f57edba753..bbb4b5f37a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -34,7 +34,7 @@ import javax.script.Bindings; "msg - is a Message payload.
" + "msgType - is a Message type.
" + "Should return the following structure:
" + - "{ msg: , metadata: , msgType: }" + + "{ msg: new payload,
   metadata: new metadata,
   msgType: new msgType }
" + "All fields in resulting object are optional and will be taken from original message if not specified.", uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, configDirective = "tbTransformationNodeScriptConfig") From 36e45c7630c8e6bad2f68795c5faf1c7a793eb23 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 5 Apr 2018 12:43:17 +0300 Subject: [PATCH 61/75] Separate js engine context for each instance. --- .../java/org/thingsboard/rule/engine/js/NashornJsEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java index ecca1c6a89..e3cc225ae7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java @@ -54,7 +54,7 @@ public class NashornJsEngine { private static final ObjectMapper mapper = new ObjectMapper(); private static NashornScriptEngineFactory factory = new NashornScriptEngineFactory(); - private static ScriptEngine engine = factory.getScriptEngine(new String[]{"--no-java"}); + private ScriptEngine engine = factory.getScriptEngine(new String[]{"--no-java"}); private final String invokeFunctionName; @@ -77,7 +77,7 @@ public class NashornJsEngine { compileScript(jsWrapperPrefix + script + JS_WRAPPER_SUFFIX); } - private static void compileScript(String script) { + private void compileScript(String script) { try { engine.eval(script); } catch (ScriptException e) { From b7cd24c693c53c3bf8fe58824dfbf9ef307e17b7 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 5 Apr 2018 15:07:48 +0300 Subject: [PATCH 62/75] Refactor script engine resources. --- .../server/actors/ActorSystemContext.java | 17 +++------ .../actors/ruleChain/DefaultTbContext.java | 7 ++++ .../service/script}/JsExecutorService.java | 28 ++++++++++----- .../service/script}/NashornJsEngine.java | 22 ++++++------ .../src/main/resources/thingsboard.yml | 2 ++ .../rule/engine/api/ListeningExecutor.java | 1 - .../rule/engine/api/ScriptEngine.java | 35 +++++++++++++++++++ .../rule/engine/api/TbContext.java | 2 ++ .../rule/engine/debug/TbMsgGeneratorNode.java | 16 ++------- .../rule/engine/filter/TbJsFilterNode.java | 7 ++-- .../rule/engine/filter/TbJsSwitchNode.java | 6 ++-- .../engine/transform/TbTransformMsgNode.java | 7 ++-- ui/src/app/rulechain/rulechain.controller.js | 10 ++++-- 13 files changed, 96 insertions(+), 64 deletions(-) rename {rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js => application/src/main/java/org/thingsboard/server/service/script}/JsExecutorService.java (69%) rename {rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js => application/src/main/java/org/thingsboard/server/service/script}/NashornJsEngine.java (95%) create mode 100644 rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 147c214a2f..b2496c0875 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -29,9 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.util.Base64Utils; import org.thingsboard.rule.engine.api.ListeningExecutor; -import org.thingsboard.rule.engine.js.JsExecutorService; import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; @@ -39,7 +37,6 @@ 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.TbMsg; -import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.transport.auth.DeviceAuthService; import org.thingsboard.server.controller.plugin.PluginWebSocketMsgEndpoint; @@ -63,15 +60,10 @@ import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import org.thingsboard.server.service.component.ComponentDiscoveryService; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import java.nio.charset.StandardCharsets; import java.util.Optional; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; @Slf4j @Component @@ -170,6 +162,10 @@ public class ActorSystemContext { @Setter private PluginWebSocketMsgEndpoint wsMsgEndpoint; + @Autowired + @Getter + private ListeningExecutor jsExecutor; + @Value("${actors.session.sync.timeout}") @Getter private long syncSessionTimeout; @@ -339,9 +335,4 @@ public class ActorSystemContext { return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); } - public ListeningExecutor getJsExecutor() { - //TODO: take thread count from yml. - return new JsExecutorService(1); - } - } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 03dc376f10..d3fdc94c8e 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -20,6 +20,7 @@ import akka.actor.Cancellable; import com.google.common.base.Function; import org.thingsboard.rule.engine.api.ListeningExecutor; import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; +import org.thingsboard.rule.engine.api.ScriptEngine; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.RuleNodeId; @@ -36,6 +37,7 @@ import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; +import org.thingsboard.server.service.script.NashornJsEngine; import scala.concurrent.duration.Duration; import java.util.List; @@ -127,6 +129,11 @@ class DefaultTbContext implements TbContext { return mainCtx.getJsExecutor(); } + @Override + public ScriptEngine createJsScriptEngine(String script, String functionName, String... argNames) { + return new NashornJsEngine(script, functionName, argNames); + } + @Override public AttributesService getAttributesService() { return mainCtx.getAttributesService(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java b/application/src/main/java/org/thingsboard/server/service/script/JsExecutorService.java similarity index 69% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java rename to application/src/main/java/org/thingsboard/server/service/script/JsExecutorService.java index 19c2bb9405..9d110d13f7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/JsExecutorService.java +++ b/application/src/main/java/org/thingsboard/server/service/script/JsExecutorService.java @@ -13,23 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.rule.engine.js; +package org.thingsboard.server.service.script; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import org.thingsboard.rule.engine.api.ListeningExecutor; +import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.util.concurrent.Callable; import java.util.concurrent.Executors; +@Component public class JsExecutorService implements ListeningExecutor{ - private final ListeningExecutorService service; + @Value("${actors.rule.js_thread_pool_size}") + private int jsExecutorThreadPoolSize; - public JsExecutorService(int threadCount) { - this.service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(threadCount)); + private ListeningExecutorService service; + + @PostConstruct + public void init() { + this.service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(jsExecutorThreadPoolSize)); + } + + @PreDestroy + public void destroy() { + if (this.service != null) { + this.service.shutdown(); + } } @Override @@ -37,9 +52,4 @@ public class JsExecutorService implements ListeningExecutor{ return service.submit(task); } - @PreDestroy - @Override - public void onDestroy() { - service.shutdown(); - } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java b/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java similarity index 95% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java rename to application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java index e3cc225ae7..38add44569 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/js/NashornJsEngine.java +++ b/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java @@ -13,32 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.rule.engine.js; +package org.thingsboard.server.service.script; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; import jdk.nashorn.api.scripting.NashornScriptEngineFactory; -import jdk.nashorn.api.scripting.ScriptObjectMirror; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; -import javax.script.*; -import java.io.IOException; -import java.nio.charset.StandardCharsets; +import javax.script.Invocable; +import javax.script.ScriptEngine; +import javax.script.ScriptException; import java.util.Collections; import java.util.Map; import java.util.Set; @Slf4j -public class NashornJsEngine { - +public class NashornJsEngine implements org.thingsboard.rule.engine.api.ScriptEngine { public static final String MSG = "msg"; public static final String METADATA = "metadata"; @@ -129,6 +125,7 @@ public class NashornJsEngine { } } + @Override public TbMsg executeUpdate(TbMsg msg) throws ScriptException { JsonNode result = executeScript(msg); if (!result.isObject()) { @@ -138,6 +135,7 @@ public class NashornJsEngine { return unbindMsg(result, msg); } + @Override public TbMsg executeGenerate(TbMsg prevMsg) throws ScriptException { JsonNode result = executeScript(prevMsg); if (!result.isObject()) { @@ -147,6 +145,7 @@ public class NashornJsEngine { return unbindMsg(result, prevMsg); } + @Override public boolean executeFilter(TbMsg msg) throws ScriptException { JsonNode result = executeScript(msg); if (!result.isBoolean()) { @@ -156,7 +155,8 @@ public class NashornJsEngine { return result.asBoolean(); } - public Set executeSwitch(TbMsg msg) throws ScriptException, NoSuchMethodException { + @Override + public Set executeSwitch(TbMsg msg) throws ScriptException { JsonNode result = executeScript(msg); if (result.isTextual()) { return Collections.singleton(result.asText()); @@ -191,6 +191,6 @@ public class NashornJsEngine { } public void destroy() { - //engine = null; + engine = null; } } diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index fc04a193e1..4ffa99811d 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -219,6 +219,8 @@ actors: termination.delay: "${ACTORS_RULE_TERMINATION_DELAY:30000}" # Errors for particular actor are persisted once per specified amount of milliseconds error_persist_frequency: "${ACTORS_RULE_ERROR_FREQUENCY:3000}" + # Specify thread pool size for javascript executor service + js_thread_pool_size: "${ACTORS_RULE_JS_THREAD_POOL_SIZE:10}" chain: # Errors for particular actor are persisted once per specified amount of milliseconds error_persist_frequency: "${ACTORS_RULE_CHAIN_ERROR_FREQUENCY:3000}" diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java index fecf019425..5420f7ff6f 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ListeningExecutor.java @@ -23,5 +23,4 @@ public interface ListeningExecutor { ListenableFuture executeAsync(Callable task); - void onDestroy(); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java new file mode 100644 index 0000000000..c2c8210f80 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java @@ -0,0 +1,35 @@ +/** + * Copyright © 2016-2018 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.rule.engine.api; + +import org.thingsboard.server.common.msg.TbMsg; + +import javax.script.ScriptException; +import java.util.Set; + +public interface ScriptEngine { + + TbMsg executeUpdate(TbMsg msg) throws ScriptException; + + TbMsg executeGenerate(TbMsg prevMsg) throws ScriptException; + + boolean executeFilter(TbMsg msg) throws ScriptException; + + Set executeSwitch(TbMsg msg) throws ScriptException; + + void destroy(); + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 9b63041193..b8c2b3888c 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -83,4 +83,6 @@ public interface TbContext { ListeningExecutor getJsExecutor(); + ScriptEngine createJsScriptEngine(String script, String functionName, String... argNames); + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java index 857baf6785..65b13710e3 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java @@ -20,23 +20,13 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; import org.thingsboard.rule.engine.TbNodeUtils; -import org.thingsboard.rule.engine.api.ListeningExecutor; -import org.thingsboard.rule.engine.api.RuleNode; -import org.thingsboard.rule.engine.api.TbContext; -import org.thingsboard.rule.engine.api.TbNode; -import org.thingsboard.rule.engine.api.TbNodeConfiguration; -import org.thingsboard.rule.engine.api.TbNodeException; -import org.thingsboard.rule.engine.filter.TbJsFilterNodeConfiguration; -import org.thingsboard.rule.engine.js.NashornJsEngine; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; -import javax.script.Bindings; - -import java.nio.charset.StandardCharsets; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -59,7 +49,7 @@ public class TbMsgGeneratorNode implements TbNode { public static final String TB_MSG_GENERATOR_NODE_MSG = "TbMsgGeneratorNodeMsg"; private TbMsgGeneratorNodeConfiguration config; - private NashornJsEngine jsEngine; + private ScriptEngine jsEngine; private long delay; private EntityId originatorId; private UUID nextTickId; @@ -74,7 +64,7 @@ public class TbMsgGeneratorNode implements TbNode { } else { originatorId = ctx.getSelfId(); } - this.jsEngine = new NashornJsEngine(config.getJsScript(), "Generate", "prevMsg", "prevMetadata", "prevMsgType"); + this.jsEngine = ctx.createJsScriptEngine(config.getJsScript(), "Generate", "prevMsg", "prevMetadata", "prevMsgType"); sentTickMsg(ctx); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java index f08135bad7..8ad344f87d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsFilterNode.java @@ -18,12 +18,9 @@ package org.thingsboard.rule.engine.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; -import org.thingsboard.rule.engine.js.NashornJsEngine; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; -import javax.script.Bindings; - import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @Slf4j @@ -43,12 +40,12 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; public class TbJsFilterNode implements TbNode { private TbJsFilterNodeConfiguration config; - private NashornJsEngine jsEngine; + private ScriptEngine jsEngine; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsFilterNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript(), "Filter"); + this.jsEngine = ctx.createJsScriptEngine(config.getJsScript(), "Filter"); } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java index 0a96fab31f..3c6704b013 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbJsSwitchNode.java @@ -18,11 +18,9 @@ package org.thingsboard.rule.engine.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; -import org.thingsboard.rule.engine.js.NashornJsEngine; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; -import javax.script.Bindings; import java.util.Set; import static org.thingsboard.rule.engine.DonAsynchron.withCallback; @@ -43,12 +41,12 @@ import static org.thingsboard.rule.engine.DonAsynchron.withCallback; public class TbJsSwitchNode implements TbNode { private TbJsSwitchNodeConfiguration config; - private NashornJsEngine jsEngine; + private ScriptEngine jsEngine; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbJsSwitchNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript(), "Switch"); + this.jsEngine = ctx.createJsScriptEngine(config.getJsScript(), "Switch"); } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java index bbb4b5f37a..bf0c9feada 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java @@ -18,12 +18,9 @@ package org.thingsboard.rule.engine.transform; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.rule.engine.TbNodeUtils; import org.thingsboard.rule.engine.api.*; -import org.thingsboard.rule.engine.js.NashornJsEngine; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; -import javax.script.Bindings; - @RuleNode( type = ComponentType.TRANSFORMATION, name = "script", @@ -41,12 +38,12 @@ import javax.script.Bindings; public class TbTransformMsgNode extends TbAbstractTransformNode { private TbTransformMsgNodeConfiguration config; - private NashornJsEngine jsEngine; + private ScriptEngine jsEngine; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class); - this.jsEngine = new NashornJsEngine(config.getJsScript(), "Transform"); + this.jsEngine = ctx.createJsScriptEngine(config.getJsScript(), "Transform"); setConfig(config); } diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index c20fa44ba7..9bd7960d0c 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -353,7 +353,9 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); vm.editingRuleNodeLink = angular.copy(edge); $mdUtil.nextTick(() => { - vm.ruleNodeLinkForm.$setPristine(); + if (vm.ruleNodeLinkForm) { + vm.ruleNodeLinkForm.$setPristine(); + } }); } }, @@ -366,7 +368,9 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.editingRuleNodeIndex = vm.ruleChainModel.nodes.indexOf(node); vm.editingRuleNode = angular.copy(node); $mdUtil.nextTick(() => { - vm.ruleNodeForm.$setPristine(); + if (vm.ruleNodeForm) { + vm.ruleNodeForm.$setPristine(); + } }); } } @@ -737,7 +741,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time nodes.push(node); } } - var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}); + var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}, true); if (res && res.length) { var firstNodeEdge = res[0]; var firstNode = vm.modelservice.nodes.getNodeByConnectorId(firstNodeEdge.destination); From c2b353f47efcc840226b31afea976053f6044fa4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 5 Apr 2018 20:57:09 +0300 Subject: [PATCH 63/75] Test rule node script functions. --- .../controller/RuleChainController.java | 83 ++++++++ .../static/rulenode/rulenode-core-config.js | 2 +- ui/src/app/api/rule-chain.service.js | 13 +- ui/src/app/components/kv-map.directive.js | 119 ++++++++++++ ui/src/app/components/kv-map.scss | 26 +++ ui/src/app/components/kv-map.tpl.html | 58 ++++++ ui/src/app/layout/index.js | 2 + ui/src/app/locale/locale.constant.js | 17 +- ui/src/app/rulechain/index.js | 4 + .../script/node-script-test.controller.js | 177 ++++++++++++++++++ .../rulechain/script/node-script-test.scss | 108 +++++++++++ .../script/node-script-test.service.js | 81 ++++++++ .../script/node-script-test.tpl.html | 119 ++++++++++++ 13 files changed, 806 insertions(+), 3 deletions(-) create mode 100644 ui/src/app/components/kv-map.directive.js create mode 100644 ui/src/app/components/kv-map.scss create mode 100644 ui/src/app/components/kv-map.tpl.html create mode 100644 ui/src/app/rulechain/script/node-script-test.controller.js create mode 100644 ui/src/app/rulechain/script/node-script-test.scss create mode 100644 ui/src/app/rulechain/script/node-script-test.service.js create mode 100644 ui/src/app/rulechain/script/node-script-test.tpl.html diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index c6befdd8ca..f69ad819ba 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -15,9 +15,17 @@ */ package org.thingsboard.server.controller; +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import org.thingsboard.rule.engine.api.ScriptEngine; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.id.PluginId; @@ -30,17 +38,25 @@ import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.service.script.NashornJsEngine; import java.util.List; +import java.util.Map; +import java.util.Set; +@Slf4j @RestController @RequestMapping("/api") public class RuleChainController extends BaseController { public static final String RULE_CHAIN_ID = "ruleChainId"; + private static final ObjectMapper objectMapper = new ObjectMapper(); + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')") @RequestMapping(value = "/ruleChain/{ruleChainId}", method = RequestMethod.GET) @ResponseBody @@ -203,4 +219,71 @@ public class RuleChainController extends BaseController { } } + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @RequestMapping(value = "/ruleChain/testScript", method = RequestMethod.POST) + @ResponseBody + public JsonNode testScript(@RequestBody JsonNode inputParams) throws ThingsboardException { + try { + String script = inputParams.get("script").asText(); + String scriptType = inputParams.get("scriptType").asText(); + String functionName = inputParams.get("functionName").asText(); + JsonNode argNamesJson = inputParams.get("argNames"); + String[] argNames = objectMapper.treeToValue(argNamesJson, String[].class); + + String data = inputParams.get("msg").asText(); + JsonNode metadataJson = inputParams.get("metadata"); + Map metadata = objectMapper.convertValue(metadataJson, new TypeReference>() {}); + String msgType = inputParams.get("msgType").asText(); + String output = ""; + String errorText = ""; + ScriptEngine engine = null; + try { + engine = new NashornJsEngine(script, functionName, argNames); + TbMsg inMsg = new TbMsg(UUIDs.timeBased(), msgType, null, new TbMsgMetaData(metadata), data); + switch (scriptType) { + case "update": + output = msgToOutput(engine.executeUpdate(inMsg)); + break; + case "generate": + output = msgToOutput(engine.executeGenerate(inMsg)); + break; + case "filter": + boolean result = engine.executeFilter(inMsg); + output = Boolean.toString(result); + break; + case "switch": + Set states = engine.executeSwitch(inMsg); + output = objectMapper.writeValueAsString(states); + break; + default: + throw new IllegalArgumentException("Unsupported script type: " + scriptType); + } + } catch (Exception e) { + log.error("Error evaluating JS function", e); + errorText = e.getMessage(); + } finally { + if (engine != null) { + engine.destroy(); + } + } + ObjectNode result = objectMapper.createObjectNode(); + result.put("output", output); + result.put("error", errorText); + return result; + } catch (Exception e) { + throw handleException(e); + } + } + + private String msgToOutput(TbMsg msg) throws Exception { + ObjectNode msgData = objectMapper.createObjectNode(); + if (!StringUtils.isEmpty(msg.getData())) { + msgData.set("msg", objectMapper.readTree(msg.getData())); + } + Map metadata = msg.getMetaData().getData(); + msgData.set("metadata", objectMapper.valueToTree(metadata)); + msgData.put("msgType", msg.getType()); + return objectMapper.writeValueAsString(msgData); + } + } diff --git a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js index 79006c2c72..cc5a4811d2 100644 --- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js +++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js @@ -1,2 +1,2 @@ -!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),r=e[t[0]];return function(e,t,a){r.apply(this,[e,t,a].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(34)},function(e,t){},1,1,function(e,t){e.exports="
tb.rulenode.message-count-required
tb.rulenode.min-message-count-message
tb.rulenode.period-seconds-required
tb.rulenode.min-period-seconds-message
"},function(e,t){e.exports="
tb.rulenode.default-ttl-required
tb.rulenode.min-default-ttl-message
"},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},6,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
"},function(e,t){e.exports="
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.types=t,n.originator=null,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue,n.configuration.originatorId&&n.configuration.originatorType?n.originator={id:n.configuration.originatorId,entityType:n.configuration.originatorType}:n.originator=null,n.$watch("originator",function(e,t){angular.equals(e,t)||(n.originator?(i.$viewValue.originatorId=n.originator.id,i.$viewValue.originatorType=n.originator.entityType):(i.$viewValue.originatorId=null,i.$viewValue.originatorType=null))},!0)},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a,n(1);var i=n(4),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(19),i=r(a),o=n(17),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.action",[]).directive("tbActionNodeTelemetryConfig",i.default).directive("tbActionNodeGeneratorConfig",l.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(5),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(6),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(22),i=r(a),o=n(23),l=r(o),s=n(20),u=r(s),d=n(24),c=r(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",l.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(7),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(8),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(9),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(27),i=r(a),o=n(26),l=r(o),s=n(28),u=r(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",l.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t,n){var r=function(r,a,i,l){function s(){if(l.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function l(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),a.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),a.$setValidity("kvMap",e)}var d=o.default;n.html(d),t.ngModelCtrl=a,t.removeKeyVal=i,t.addKeyVal=l,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||a.$setViewValue(t.query)}),a.$render=function(){if(a.$viewValue){var e=a.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(13),o=r(i);n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(14),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(15),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(31),i=r(a),o=n(33),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.transform",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",l.default).name},[38,16],function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(37),i=r(a),o=n(25),l=r(o),s=n(21),u=r(s),d=n(32),c=r(d),m=n(18),g=r(m),f=n(30),p=r(f),b=n(29),v=r(b),y=n(36),h=r(y);t.default=angular.module("thingsboard.ruleChain.config",[i.default,l.default,u.default,c.default,g.default]).directive("tbRelationsQueryConfig",p.default).directive("tbKvMapConfig",v.default).config(h.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){(0,o.default)(t);for(var n in t){var r=t[n];e.translations(n,r)}}a.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(35),o=r(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name},function(e,t,n,r){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function i(e){var t=function(t,n,r,a){var i=l.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}i.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var o=n(r),l=a(o)}])); +!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n={};return t.m=e,t.c=n,t.p="/static/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),r=e[t[0]];return function(e,t,a){r.apply(this,[e,t,a].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){e.exports=n(34)},function(e,t){},1,1,function(e,t){e.exports="
tb.rulenode.message-count-required
tb.rulenode.min-message-count-message
tb.rulenode.period-seconds-required
tb.rulenode.min-period-seconds-message
{{ 'tb.rulenode.test-generator-function' | translate }}
"},function(e,t){e.exports="
tb.rulenode.default-ttl-required
tb.rulenode.min-default-ttl-message
"},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},function(e,t){e.exports='
'},function(e,t){e.exports="
{{ 'tb.rulenode.latest-telemetry' | translate }}
"},6,function(e,t){e.exports='
{{item}}
tb.rulenode.no-message-types-found
tb.rulenode.no-message-type-matching tb.rulenode.create-new-message-type
{{$chip.name}}
'},function(e,t){e.exports="
{{ 'tb.rulenode.test-filter-function' | translate }}
"},function(e,t){e.exports="
{{ 'tb.rulenode.test-switch-function' | translate }}
"},function(e,t){e.exports='
{{ keyText }} {{ valText }}  
{{keyRequiredText}}
{{valRequiredText}}
 {{ \'tb.key-val.remove-entry\' | translate }} close
{{ \'tb.key-val.add-entry\' | translate }} add {{ \'action.add\' | translate }}
'},function(e,t){e.exports="
{{ ('relation.search-direction.' + direction) | translate}}
relation.relation-filters
"},function(e,t){e.exports='
{{ source.name | translate}}
{{ \'tb.rulenode.clone-message\' | translate }}
'},function(e,t){e.exports="
{{ 'tb.rulenode.test-transformer-function' | translate }}
{{ 'tb.rulenode.clone-message' | translate }}
"},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t,n,r){var a=function(a,i,l,s){var u=o.default;i.html(u),a.types=n,a.originator=null,a.$watch("configuration",function(e,t){angular.equals(e,t)||s.$setViewValue(a.configuration)}),s.$render=function(){a.configuration=s.$viewValue,a.configuration.originatorId&&a.configuration.originatorType?a.originator={id:a.configuration.originatorId,entityType:a.configuration.originatorType}:a.originator=null,a.$watch("originator",function(e,t){angular.equals(e,t)||(a.originator?(s.$viewValue.originatorId=a.originator.id,s.$viewValue.originatorType=a.originator.entityType):(s.$viewValue.originatorId=null,s.$viewValue.originatorType=null))},!0)},a.testScript=function(e){var n=angular.copy(a.configuration.jsScript),i={temperature:22.4,humidity:78},o={sensorType:"temperature"};r.testNodeScript(e,n,"generate",t.instant("tb.rulenode.generator")+"","Generate",["prevMsg","prevMetadata","prevMsgType"],i,o,"DebugMsg").then(function(e){a.configuration.jsScript=e,s.$setDirty()})},e(i.contents())(a)};return{restrict:"E",require:"^ngModel",scope:{},link:a}}a.$inject=["$compile","$translate","types","ruleNodeScriptTest"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a,n(1);var i=n(4),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(19),i=r(a),o=n(17),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.action",[]).directive("tbActionNodeTelemetryConfig",i.default).directive("tbActionNodeGeneratorConfig",l.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(5),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(6),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(22),i=r(a),o=n(23),l=r(o),s=n(20),u=r(s),d=n(24),c=r(d);t.default=angular.module("thingsboard.ruleChain.config.enrichment",[]).directive("tbEnrichmentNodeOriginatorAttributesConfig",i.default).directive("tbEnrichmentNodeRelatedAttributesConfig",l.default).directive("tbEnrichmentNodeCustomerAttributesConfig",u.default).directive("tbEnrichmentNodeTenantAttributesConfig",c.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l);var s=186;n.separatorKeys=[t.KEY_CODE.ENTER,t.KEY_CODE.COMMA,s],n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","$mdConstant"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(7),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(8),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e){var t=function(t,n,r,a){var i=o.default;n.html(i),t.$watch("configuration",function(e,n){angular.equals(e,n)||a.$setViewValue(t.configuration)}),a.$render=function(){t.configuration=a.$viewValue},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(9),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(27),i=r(a),o=n(26),l=r(o),s=n(28),u=r(s);t.default=angular.module("thingsboard.ruleChain.config.filter",[]).directive("tbFilterNodeScriptConfig",i.default).directive("tbFilterNodeMessageTypeConfig",l.default).directive("tbFilterNodeSwitchConfig",u.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t,n){var r=function(r,a,i,l){function s(){if(l.$viewValue){for(var e=[],t=0;t-1&&t.kvList.splice(e,1)}function l(){t.kvList||(t.kvList=[]),t.kvList.push({key:"",value:""})}function s(){var e={};t.kvList.forEach(function(t){t.key&&(e[t.key]=t.value)}),a.$setViewValue(e),u()}function u(){var e=!0;t.required&&!t.kvList.length&&(e=!1),a.$setValidity("kvMap",e)}var d=o.default;n.html(d),t.ngModelCtrl=a,t.removeKeyVal=i,t.addKeyVal=l,t.kvList=[],t.$watch("query",function(e,n){angular.equals(e,n)||a.$setViewValue(t.query)}),a.$render=function(){if(a.$viewValue){var e=a.$viewValue;t.kvList.length=0;for(var n in e)t.kvList.push({key:n,value:e[n]})}t.$watch("kvList",function(e,t){angular.equals(e,t)||s()},!0),u()},e(n.contents())(t)};return{restrict:"E",require:"^ngModel",scope:{required:"=ngRequired",disabled:"=ngDisabled",requiredText:"=",keyText:"=",keyRequiredText:"=",valText:"=",valRequiredText:"="},link:t}}a.$inject=["$compile"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(13),o=r(i);n(3)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.types=t,n.$watch("query",function(e,t){angular.equals(e,t)||i.$setViewValue(n.query)}),i.$render=function(){n.query=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","types"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(14),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){var n=function(n,r,a,i){var l=o.default;r.html(l),n.ruleNodeTypes=t,n.$watch("configuration",function(e,t){angular.equals(e,t)||i.$setViewValue(n.configuration)}),i.$render=function(){n.configuration=i.$viewValue},e(r.contents())(n)};return{restrict:"E",require:"^ngModel",scope:{},link:n}}a.$inject=["$compile","ruleNodeTypes"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(15),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(31),i=r(a),o=n(33),l=r(o);t.default=angular.module("thingsboard.ruleChain.config.transform",[]).directive("tbTransformationNodeChangeOriginatorConfig",i.default).directive("tbTransformationNodeScriptConfig",l.default).name},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t,n){var r=function(r,a,i,l){var s=o.default;a.html(s),r.$watch("configuration",function(e,t){angular.equals(e,t)||l.$setViewValue(r.configuration)}),l.$render=function(){r.configuration=l.$viewValue},r.testScript=function(e){var a=angular.copy(r.configuration.jsScript),i={temperature:22.4,humidity:78},o={sensorType:"temperature"};n.testNodeScript(e,a,"update",t.instant("tb.rulenode.transformer")+"","Transform",["msg","metadata","msgType"],i,o,"POST_TELEMETRY").then(function(e){r.configuration.jsScript=e,l.$setDirty()})},e(a.contents())(r)};return{restrict:"E",require:"^ngModel",scope:{},link:r}}a.$inject=["$compile","$translate","ruleNodeScriptTest"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(16),o=r(i)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var a=n(37),i=r(a),o=n(25),l=r(o),s=n(21),u=r(s),d=n(32),c=r(d),m=n(18),g=r(m),f=n(30),p=r(f),b=n(29),v=r(b),y=n(36),h=r(y);t.default=angular.module("thingsboard.ruleChain.config",[i.default,l.default,u.default,c.default,g.default]).directive("tbRelationsQueryConfig",p.default).directive("tbKvMapConfig",v.default).config(h.default).name},function(e,t){"use strict";function n(e){var t={tb:{rulenode:{filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","relations-query":"Relations query","max-relation-level":"Max relation level","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate","test-generator-function":"Test generator function",generator:"Generator","test-filter-function":"Test filter function","test-switch-function":"Test switch function","test-transformer-function":"Test transformer function",transformer:"Transformer"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};angular.merge(e.en_US,t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function a(e,t){(0,o.default)(t);for(var n in t){var r=t[n];e.translations(n,r)}}a.$inject=["$translateProvider","locales"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var i=n(35),o=r(i)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{messageType:{POST_ATTRIBUTES:{name:"Post attributes",value:"POST_ATTRIBUTES"},POST_TELEMETRY:{name:"Post telemetry",value:"POST_TELEMETRY"},RPC_REQUEST:{name:"RPC Request",value:"RPC_REQUEST"}},originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}}}).name}])); //# sourceMappingURL=rulenode-core-config.js.map \ No newline at end of file diff --git a/ui/src/app/api/rule-chain.service.js b/ui/src/app/api/rule-chain.service.js index b930cf18fa..03b3a82684 100644 --- a/ui/src/app/api/rule-chain.service.js +++ b/ui/src/app/api/rule-chain.service.js @@ -33,7 +33,8 @@ function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, co getRuleNodeComponents: getRuleNodeComponents, getRuleNodeComponentByClazz: getRuleNodeComponentByClazz, getRuleNodeSupportedLinks: getRuleNodeSupportedLinks, - resolveTargetRuleChains: resolveTargetRuleChains + resolveTargetRuleChains: resolveTargetRuleChains, + testScript: testScript }; return service; @@ -292,5 +293,15 @@ function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, co return componentDescriptorService.getComponentDescriptorsByTypes(types.ruleNodeTypeComponentTypes); } + function testScript(inputParams) { + var deferred = $q.defer(); + var url = '/api/ruleChain/testScript'; + $http.post(url, inputParams).then(function success(response) { + deferred.resolve(response.data); + }, function fail() { + deferred.reject(); + }); + return deferred.promise; + } } diff --git a/ui/src/app/components/kv-map.directive.js b/ui/src/app/components/kv-map.directive.js new file mode 100644 index 0000000000..bc8865f4b1 --- /dev/null +++ b/ui/src/app/components/kv-map.directive.js @@ -0,0 +1,119 @@ +/* + * Copyright © 2016-2018 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. + */ +import './kv-map.scss'; + +/* eslint-disable import/no-unresolved, import/default */ + +import kvMapTemplate from './kv-map.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +export default angular.module('thingsboard.directives.keyValMap', []) + .directive('tbKeyValMap', KeyValMap) + .name; + +/*@ngInject*/ +function KeyValMap() { + return { + restrict: "E", + scope: true, + bindToController: { + disabled:'=ngDisabled', + titleText: '@?', + keyPlaceholderText: '@?', + valuePlaceholderText: '@?', + noDataText: '@?', + keyValMap: '=' + }, + controller: KeyValMapController, + controllerAs: 'vm', + templateUrl: kvMapTemplate + }; +} + +/*@ngInject*/ +function KeyValMapController($scope, $mdUtil) { + + let vm = this; + + vm.kvList = []; + + vm.removeKeyVal = removeKeyVal; + vm.addKeyVal = addKeyVal; + + $scope.$watch('vm.keyValMap', () => { + stopWatchKvList(); + vm.kvList.length = 0; + if (vm.keyValMap) { + for (var property in vm.keyValMap) { + if (vm.keyValMap.hasOwnProperty(property)) { + vm.kvList.push( + { + key: property + '', + value: vm.keyValMap[property] + } + ); + } + } + } + $mdUtil.nextTick(() => { + watchKvList(); + }); + }); + + function watchKvList() { + $scope.kvListWatcher = $scope.$watch('vm.kvList', () => { + if (!vm.keyValMap) { + return; + } + for (var property in vm.keyValMap) { + if (vm.keyValMap.hasOwnProperty(property)) { + delete vm.keyValMap[property]; + } + } + for (var i=0;i -1) { + vm.kvList.splice(index, 1); + } + } + + function addKeyVal() { + if (!vm.kvList) { + vm.kvList = []; + } + vm.kvList.push( + { + key: '', + value: '' + } + ); + } +} diff --git a/ui/src/app/components/kv-map.scss b/ui/src/app/components/kv-map.scss new file mode 100644 index 0000000000..d51653c3b8 --- /dev/null +++ b/ui/src/app/components/kv-map.scss @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2018 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. + */ +.tb-kv-map { + span.no-data-found { + position: relative; + height: 40px; + text-transform: uppercase; + display: flex; + &.disabled { + color: rgba(0,0,0,0.38); + } + } +} \ No newline at end of file diff --git a/ui/src/app/components/kv-map.tpl.html b/ui/src/app/components/kv-map.tpl.html new file mode 100644 index 0000000000..5114256713 --- /dev/null +++ b/ui/src/app/components/kv-map.tpl.html @@ -0,0 +1,58 @@ + +
+ +
+ + + + + + + + + {{ 'key-val.remove-entry' | translate }} + + + close + + +
+ {{vm.noDataText ? vm.noDataText : 'key-val.no-data'}} +
+ + + {{ 'key-val.add-entry' | translate }} + + action.add + +
+
diff --git a/ui/src/app/layout/index.js b/ui/src/app/layout/index.js index 6cb9bbd279..6ec7ef79a9 100644 --- a/ui/src/app/layout/index.js +++ b/ui/src/app/layout/index.js @@ -29,6 +29,7 @@ import thingsboardNoAnimate from '../components/no-animate.directive'; import thingsboardOnFinishRender from '../components/finish-render.directive'; import thingsboardSideMenu from '../components/side-menu.directive'; import thingsboardDashboardAutocomplete from '../components/dashboard-autocomplete.directive'; +import thingsboardKvMap from '../components/kv-map.directive'; import thingsboardJsonObjectEdit from '../components/json-object-edit.directive'; import thingsboardJsonContent from '../components/json-content.directive'; @@ -93,6 +94,7 @@ export default angular.module('thingsboard.home', [ thingsboardOnFinishRender, thingsboardSideMenu, thingsboardDashboardAutocomplete, + thingsboardKvMap, thingsboardJsonObjectEdit, thingsboardJsonContent ]) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index f3666447dc..9d35cd137e 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -962,6 +962,13 @@ export default angular.module('thingsboard.locale', []) "no-return-error": "Function must return value!", "return-type-mismatch": "Function must return value of '{{type}}' type!" }, + "key-val": { + "key": "Key", + "value": "Value", + "remove-entry": "Remove entry", + "add-entry": "Add entry", + "no-data": "No entries" + }, "layout": { "layout": "Layout", "manage": "Manage layouts", @@ -1220,7 +1227,15 @@ export default angular.module('thingsboard.locale', []) "type-rule-chain-details": "Forwards incoming messages to specified Rule Chain", "directive-is-not-loaded": "Defined configuration directive '{{directiveName}}' is not available.", "ui-resources-load-error": "Failed to load configuration ui resources.", - "invalid-target-rulechain": "Unable to resolve target rule chain!" + "invalid-target-rulechain": "Unable to resolve target rule chain!", + "test-script-function": "Test script function", + "message": "Message", + "message-type": "Message type", + "message-type-required": "Message type is required", + "metadata": "Metadata", + "metadata-required": "Metadata entries can't be empty.", + "output": "Output", + "test": "Test" }, "rule-plugin": { "management": "Rules and plugins management" diff --git a/ui/src/app/rulechain/index.js b/ui/src/app/rulechain/index.js index c674467d35..7740dd0669 100644 --- a/ui/src/app/rulechain/index.js +++ b/ui/src/app/rulechain/index.js @@ -17,11 +17,13 @@ import RuleChainRoutes from './rulechain.routes'; import RuleChainsController from './rulechains.controller'; import {RuleChainController, AddRuleNodeController, AddRuleNodeLinkController} from './rulechain.controller'; +import NodeScriptTestController from './script/node-script-test.controller'; import RuleChainDirective from './rulechain.directive'; import RuleNodeDefinedConfigDirective from './rulenode-defined-config.directive'; import RuleNodeConfigDirective from './rulenode-config.directive'; import RuleNodeDirective from './rulenode.directive'; import LinkDirective from './link.directive'; +import NodeScriptTest from './script/node-script-test.service'; export default angular.module('thingsboard.ruleChain', []) .config(RuleChainRoutes) @@ -29,9 +31,11 @@ export default angular.module('thingsboard.ruleChain', []) .controller('RuleChainController', RuleChainController) .controller('AddRuleNodeController', AddRuleNodeController) .controller('AddRuleNodeLinkController', AddRuleNodeLinkController) + .controller('NodeScriptTestController', NodeScriptTestController) .directive('tbRuleChain', RuleChainDirective) .directive('tbRuleNodeDefinedConfig', RuleNodeDefinedConfigDirective) .directive('tbRuleNodeConfig', RuleNodeConfigDirective) .directive('tbRuleNode', RuleNodeDirective) .directive('tbRuleNodeLink', LinkDirective) + .factory('ruleNodeScriptTest', NodeScriptTest) .name; diff --git a/ui/src/app/rulechain/script/node-script-test.controller.js b/ui/src/app/rulechain/script/node-script-test.controller.js new file mode 100644 index 0000000000..487d11ff19 --- /dev/null +++ b/ui/src/app/rulechain/script/node-script-test.controller.js @@ -0,0 +1,177 @@ +/* + * Copyright © 2016-2018 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. + */ + +import './node-script-test.scss'; + +import Split from 'split.js'; + +import beautify from 'js-beautify'; + +const js_beautify = beautify.js; + +/*@ngInject*/ +export default function NodeScriptTestController($scope, $mdDialog, $window, $document, $timeout, + $q, $mdUtil, $translate, toast, types, utils, + ruleChainService, onShowingCallback, msg, msgType, metadata, + functionTitle, inputParams) { + + var vm = this; + + vm.types = types; + vm.functionTitle = functionTitle; + vm.inputParams = inputParams; + vm.inputParams.msg = js_beautify(angular.toJson(msg), {indent_size: 4}); + vm.inputParams.metadata = metadata; + vm.inputParams.msgType = msgType; + + vm.output = ''; + + vm.test = test; + vm.save = save; + vm.cancel = cancel; + + $scope.$watch('theForm.metadataForm.$dirty', (newVal) => { + if (newVal) { + toast.hide(); + } + }); + + onShowingCallback.onShowed = () => { + vm.nodeScriptTestDialogElement = angular.element('.tb-node-script-test-dialog'); + var w = vm.nodeScriptTestDialogElement.width(); + if (w > 0) { + initSplitLayout(); + } else { + $scope.$watch( + function () { + return vm.nodeScriptTestDialogElement[0].offsetWidth || parseInt(vm.nodeScriptTestDialogElement.css('width'), 10); + }, + function (newSize) { + if (newSize > 0) { + initSplitLayout(); + } + } + ); + } + }; + + function onDividerDrag() { + $scope.$broadcast('update-ace-editor-size'); + } + + function initSplitLayout() { + if (!vm.layoutInited) { + Split([angular.element('#top_panel', vm.nodeScriptTestDialogElement)[0], angular.element('#bottom_panel', vm.nodeScriptTestDialogElement)[0]], { + sizes: [35, 65], + gutterSize: 8, + cursor: 'row-resize', + direction: 'vertical', + onDrag: function () { + onDividerDrag() + } + }); + + Split([angular.element('#top_left_panel', vm.nodeScriptTestDialogElement)[0], angular.element('#top_right_panel', vm.nodeScriptTestDialogElement)[0]], { + sizes: [50, 50], + gutterSize: 8, + cursor: 'col-resize', + onDrag: function () { + onDividerDrag() + } + }); + + Split([angular.element('#bottom_left_panel', vm.nodeScriptTestDialogElement)[0], angular.element('#bottom_right_panel', vm.nodeScriptTestDialogElement)[0]], { + sizes: [50, 50], + gutterSize: 8, + cursor: 'col-resize', + onDrag: function () { + onDividerDrag() + } + }); + + onDividerDrag(); + + $scope.$applyAsync(function () { + vm.layoutInited = true; + var w = angular.element($window); + $timeout(function () { + w.triggerHandler('resize') + }); + }); + + } + } + + function test() { + testNodeScript().then( + (output) => { + vm.output = js_beautify(output, {indent_size: 4}); + } + ); + } + + function checkInputParamErrors() { + $scope.theForm.metadataForm.$setPristine(); + $scope.$broadcast('form-submit', 'validatePayload'); + if (!$scope.theForm.payloadForm.$valid) { + return false; + } else if (!$scope.theForm.metadataForm.$valid) { + showMetadataError($translate.instant('rulenode.metadata-required')); + return false; + } + return true; + } + + function showMetadataError(error) { + var toastParent = angular.element('#metadata-panel', vm.nodeScriptTestDialogElement); + toast.showError(error, toastParent, 'bottom left'); + } + + function testNodeScript() { + var deferred = $q.defer(); + if (checkInputParamErrors()) { + $mdUtil.nextTick(() => { + ruleChainService.testScript(vm.inputParams).then( + (result) => { + if (result.error) { + toast.showError(result.error); + deferred.reject(); + } else { + deferred.resolve(result.output); + } + }, + () => { + deferred.reject(); + } + ); + }); + } else { + deferred.reject(); + } + return deferred.promise; + } + + function cancel() { + $mdDialog.cancel(); + } + + function save() { + testNodeScript().then(() => { + $scope.theForm.funcBodyForm.$setPristine(); + $mdDialog.hide(vm.inputParams.script); + }); + } +} diff --git a/ui/src/app/rulechain/script/node-script-test.scss b/ui/src/app/rulechain/script/node-script-test.scss new file mode 100644 index 0000000000..50bd4964d3 --- /dev/null +++ b/ui/src/app/rulechain/script/node-script-test.scss @@ -0,0 +1,108 @@ +/** + * Copyright © 2016-2018 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. + */ +@import '../../../scss/constants'; +@import "~compass-sass-mixins/lib/compass"; + +md-dialog.tb-node-script-test-dialog { + &.md-dialog-fullscreen { + min-height: 100%; + min-width: 100%; + border-radius: 0; + } + + .tb-split { + @include box-sizing(border-box); + overflow-y: auto; + overflow-x: hidden; + } + + .ace_editor { + font-size: 14px !important; + } + + .tb-content { + border: 1px solid #C0C0C0; + padding-top: 5px; + padding-left: 5px; + } + + .gutter { + background-color: #eeeeee; + + background-repeat: no-repeat; + background-position: 50%; + } + + .gutter.gutter-horizontal { + cursor: col-resize; + background-image: url('../../../../node_modules/split.js/grips/vertical.png'); + } + + .gutter.gutter-vertical { + cursor: row-resize; + background-image: url('../../../../node_modules/split.js/grips/horizontal.png'); + } + + .tb-split.tb-split-horizontal, .gutter.gutter-horizontal { + height: 100%; + float: left; + } + + .tb-split.tb-split-vertical { + display: flex; + .tb-split.tb-content { + height: 100%; + } + } + + div.tb-editor-area-title-panel { + position: absolute; + font-size: 0.800rem; + font-weight: 500; + top: 10px; + right: 40px; + z-index: 5; + label { + color: #00acc1; + background: rgba(220, 220, 220, 0.35); + border-radius: 5px; + padding: 4px; + text-transform: uppercase; + } + .md-button { + color: #7B7B7B; + min-width: 32px; + min-height: 15px; + line-height: 15px; + font-size: 0.800rem; + margin: 0; + padding: 4px; + background: rgba(220, 220, 220, 0.35); + } + } + + .tb-resize-container { + overflow-y: auto; + height: 100%; + width: 100%; + position: relative; + + .ace_editor { + height: 100%; + } + } + +} diff --git a/ui/src/app/rulechain/script/node-script-test.service.js b/ui/src/app/rulechain/script/node-script-test.service.js new file mode 100644 index 0000000000..c685634cf5 --- /dev/null +++ b/ui/src/app/rulechain/script/node-script-test.service.js @@ -0,0 +1,81 @@ +/* + * Copyright © 2016-2018 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. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import nodeScriptTestTemplate from './node-script-test.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +/*@ngInject*/ +export default function NodeScriptTest($q, $mdDialog, $document) { + + var service = { + testNodeScript: testNodeScript + }; + + return service; + + function testNodeScript($event, script, scriptType, functionTitle, functionName, argNames, msg, metadata, msgType) { + var deferred = $q.defer(); + + if ($event) { + $event.stopPropagation(); + } + var onShowingCallback = { + onShowed: () => { + } + }; + + var inputParams = { + script: script, + scriptType: scriptType, + functionName: functionName, + argNames: argNames + }; + + $mdDialog.show({ + controller: 'NodeScriptTestController', + controllerAs: 'vm', + templateUrl: nodeScriptTestTemplate, + parent: angular.element($document[0].body), + locals: { + msg: msg, + metadata: metadata, + msgType: msgType, + functionTitle: functionTitle, + inputParams: inputParams, + onShowingCallback: onShowingCallback + }, + fullscreen: true, + skipHide: true, + targetEvent: $event, + onComplete: () => { + onShowingCallback.onShowed(); + } + }).then( + (script) => { + deferred.resolve(script); + }, + () => { + deferred.reject(); + } + ); + + return deferred.promise; + } + +} \ No newline at end of file diff --git a/ui/src/app/rulechain/script/node-script-test.tpl.html b/ui/src/app/rulechain/script/node-script-test.tpl.html new file mode 100644 index 0000000000..933724061f --- /dev/null +++ b/ui/src/app/rulechain/script/node-script-test.tpl.html @@ -0,0 +1,119 @@ + + +
+ +
+

{{ 'rulenode.test-script-function' | translate }}

+ + + + +
+ + +
+
+
+
+
+ +
+ +
+
+ + + +
+
rulenode.message-type-required
+
+ +
+ + +
+ +
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + +
+
+
+
+ + + + {{ 'rulenode.test' | translate }} + + + + {{ 'action.save' | translate }} + + {{ 'action.cancel' | translate }} + +
+ From 4eb08a6490f739bbf099f129495193f9a49bd75f Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 6 Apr 2018 22:03:15 +0300 Subject: [PATCH 64/75] Rule Chain UI: Context menu support. --- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 83 +++++++++++++++++++- ui/src/app/rulechain/rulechain.scss | 56 +++++++++---- ui/src/app/rulechain/rulechain.tpl.html | 43 +++++++--- 4 files changed, 155 insertions(+), 28 deletions(-) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 9d35cd137e..e7c0f586b3 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1209,6 +1209,7 @@ export default angular.module('thingsboard.locale', []) "rulenode-details": "Rule node details", "debug-mode": "Debug mode", "configuration": "Configuration", + "link": "Link", "link-details": "Rule node link details", "add-link": "Add link", "link-label": "Link label", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index 9bd7960d0c..eaa14fbf48 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -104,8 +104,89 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.triggerResize = triggerResize; + vm.openRuleChainContextMenu = openRuleChainContextMenu; + initHotKeys(); + function openRuleChainContextMenu($event, $mdOpenMousepointMenu) { + if (vm.canvasControl.modelservice && !$event.ctrlKey && !$event.metaKey) { + var x = $event.clientX; + var y = $event.clientY; + var item = vm.canvasControl.modelservice.getItemInfoAtPoint(x, y); + vm.contextInfo = prepareContextMenu(item); + if (vm.contextInfo.items && vm.contextInfo.items.length > 0) { + vm.contextMenuEvent = $event; + $mdOpenMousepointMenu($event); + return false; + } + } + } + + function prepareContextMenu(item) { + if (objectsSelected() || (!item.node && !item.edge)) { + return prepareRuleChainContextMenu(); + } else if (item.node) { + return prepareRuleNodeContextMenu(item.node); + } else if (item.edge) { + return prepareEdgeContextMenu(item.edge); + } + } + + function prepareRuleChainContextMenu() { + var contextInfo = { + title: vm.ruleChain.name, + subtitle: $translate.instant('rulechain.rulechain') + }; + contextInfo.items = []; + return contextInfo; + } + + function prepareRuleNodeContextMenu(node) { + var contextInfo = { + headerClass: node.nodeClass, + icon: node.icon, + title: node.name, + subtitle: node.component.name + }; + contextInfo.items = []; + if (!node.readonly) { + contextInfo.items.push( + { + action: function () { + vm.canvasControl.modelservice.nodes.delete(node); + }, + enabled: true, + value: "action.delete", + icon: "clear", + shortcut: "M-X" + } + ); + } + return contextInfo; + } + + function prepareEdgeContextMenu(edge) { + var contextInfo = { + headerClass: 'tb-link', + icon: 'trending_flat', + title: edge.label, + subtitle: $translate.instant('rulenode.link') + }; + contextInfo.items = []; + contextInfo.items.push( + { + action: function () { + vm.canvasControl.modelservice.edges.delete(edge); + }, + enabled: true, + value: "action.delete", + icon: "clear", + shortcut: "M-X" + } + ); + return contextInfo; + } + function initHotKeys() { hotkeys.bindTo($scope) .add({ @@ -652,7 +733,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time } if (vm.canvasControl.adjustCanvasSize) { - vm.canvasControl.adjustCanvasSize(); + vm.canvasControl.adjustCanvasSize(true); } vm.isDirty = false; diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index 187a722e0f..68f042352a 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -105,12 +105,53 @@ } } +#tb-rule-chain-context-menu { + padding-top: 0px; + border-radius: 8px; + .tb-context-menu-header { + padding: 8px 5px 5px; + font-size: 14px; + display: flex; + flex-direction: row; + &.tb-link { + background-color: #aac7e4; + } + md-icon { + padding-left: 2px; + padding-right: 10px; + } + .tb-context-menu-title { + font-weight: 500; + } + .tb-context-menu-subtitle { + } + } +} + .fc-canvas { min-width: 100%; min-height: 100%; outline: none; } +.tb-rule-node, #tb-rule-chain-context-menu .tb-context-menu-header { + &.tb-filter-type { + background-color: #f1e861; + } + &.tb-enrichment-type { + background-color: #cdf14e; + } + &.tb-transformation-type { + background-color: #79cef1; + } + &.tb-action-type { + background-color: #f1928f; + } + &.tb-rule-chain-type { + background-color: #d6c4f1; + } +} + .tb-rule-node { display: flex; flex-direction: row; @@ -139,21 +180,6 @@ background-color: #a3eaa9; user-select: none; } - &.tb-filter-type { - background-color: #f1e861; - } - &.tb-enrichment-type { - background-color: #cdf14e; - } - &.tb-transformation-type { - background-color: #79cef1; - } - &.tb-action-type { - background-color: #f1928f; - } - &.tb-rule-chain-type { - background-color: #d6c4f1; - } md-icon { font-size: 20px; width: 20px; diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 37fcd9bfb3..8a8dcc54ea 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -99,18 +99,37 @@ -
- - -
+ +
+ + +
+ +
+ {{vm.contextInfo.icon}} +
+
{{vm.contextInfo.title}}
+
{{vm.contextInfo.subtitle}}
+
+
+ + + {{item.icon}} + {{item.value}} + {{ item.shortcut | keyboardShortcut }} + + + + Date: Fri, 6 Apr 2018 22:56:41 +0300 Subject: [PATCH 65/75] Rule Chain UI: Context menu support. --- .../components/mousepoint-menu.directive.js | 7 +- ui/src/app/locale/locale.constant.js | 7 +- ui/src/app/rulechain/rulechain.controller.js | 147 ++++++++++++++---- ui/src/app/rulechain/rulechain.scss | 4 + ui/src/app/rulechain/rulechain.tpl.html | 2 +- 5 files changed, 135 insertions(+), 32 deletions(-) diff --git a/ui/src/app/components/mousepoint-menu.directive.js b/ui/src/app/components/mousepoint-menu.directive.js index 2a0ab52b36..9015268d40 100644 --- a/ui/src/app/components/mousepoint-menu.directive.js +++ b/ui/src/app/components/mousepoint-menu.directive.js @@ -27,7 +27,12 @@ function MousepointMenu() { var offset = $element.offset(); var x = $event.pageX - offset.left; var y = $event.pageY - offset.top; - + if ($attrs.tbOffsetX) { + x += Number($attrs.tbOffsetX); + } + if ($attrs.tbOffsetY) { + y += Number($attrs.tbOffsetY); + } var offsets = { left: x, top: y diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index e7c0f586b3..bd5858f688 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1203,9 +1203,12 @@ export default angular.module('thingsboard.locale', []) "type": "Type", "description": "Description", "delete": "Delete rule node", - "select-all": "Select all nodes and connections", - "deselect-all": "Deselect all nodes and connections", + "select-all-objects": "Select all nodes and connections", + "deselect-all-objects": "Deselect all nodes and connections", "delete-selected-objects": "Delete selected nodes and connections", + "delete-selected": "Delete selected", + "select-all": "Select all", + "deselect-all": "Deselect all", "rulenode-details": "Rule node details", "debug-mode": "Debug mode", "configuration": "Configuration", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index eaa14fbf48..f6572163dd 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -134,10 +134,70 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time function prepareRuleChainContextMenu() { var contextInfo = { + headerClass: 'tb-rulechain', + icon: 'settings_ethernet', title: vm.ruleChain.name, subtitle: $translate.instant('rulechain.rulechain') }; contextInfo.items = []; + if (objectsSelected()) { + contextInfo.items.push( + { + action: function () { + vm.modelservice.deselectAll(); + }, + enabled: true, + value: "rulenode.deselect-all", + icon: "tab_unselected", + shortcut: "Esc" + } + ); + contextInfo.items.push( + { + action: function () { + vm.modelservice.deleteSelected(); + }, + enabled: true, + value: "rulenode.delete-selected", + icon: "clear", + shortcut: "Del" + } + ); + } else { + contextInfo.items.push( + { + action: function () { + vm.modelservice.selectAll(); + }, + enabled: true, + value: "rulenode.select-all", + icon: "select_all", + shortcut: "M-A" + } + ); + } + contextInfo.items.push( + { + action: function () { + vm.saveRuleChain(); + }, + enabled: !(vm.isInvalid || (!vm.isDirty && !vm.isImport)), + value: "action.apply-changes", + icon: "done", + shortcut: "M-S" + } + ); + contextInfo.items.push( + { + action: function () { + vm.revertRuleChain(); + }, + enabled: vm.isDirty, + value: "action.decline-changes", + icon: "close", + shortcut: "M-Z" + } + ); return contextInfo; } @@ -150,6 +210,16 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time }; contextInfo.items = []; if (!node.readonly) { + contextInfo.items.push( + { + action: function () { + openNodeDetails(node); + }, + enabled: true, + value: "rulenode.details", + icon: "menu" + } + ); contextInfo.items.push( { action: function () { @@ -173,6 +243,19 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time subtitle: $translate.instant('rulenode.link') }; contextInfo.items = []; + var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); + if (sourceNode.component.type != types.ruleNodeType.INPUT.value) { + contextInfo.items.push( + { + action: function () { + openLinkDetails(edge); + }, + enabled: true, + value: "rulenode.details", + icon: "menu" + } + ); + } contextInfo.items.push( { action: function () { @@ -191,7 +274,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time hotkeys.bindTo($scope) .add({ combo: 'ctrl+a', - description: $translate.instant('rulenode.select-all'), + description: $translate.instant('rulenode.select-all-objects'), allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], callback: function (event) { event.preventDefault(); @@ -200,7 +283,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time }) .add({ combo: 'esc', - description: $translate.instant('rulenode.deselect-all'), + description: $translate.instant('rulenode.deselect-all-objects'), allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], callback: function (event) { event.preventDefault(); @@ -425,35 +508,11 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.editCallbacks = { edgeDoubleClick: function (event, edge) { - var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); - if (sourceNode.component.type != types.ruleNodeType.INPUT.value) { - vm.isEditingRuleNode = false; - vm.editingRuleNode = null; - vm.editingRuleNodeLinkLabels = ruleChainService.getRuleNodeSupportedLinks(sourceNode.component); - vm.isEditingRuleNodeLink = true; - vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); - vm.editingRuleNodeLink = angular.copy(edge); - $mdUtil.nextTick(() => { - if (vm.ruleNodeLinkForm) { - vm.ruleNodeLinkForm.$setPristine(); - } - }); - } + openLinkDetails(edge); }, nodeCallbacks: { 'doubleClick': function (event, node) { - if (node.component.type != types.ruleNodeType.INPUT.value) { - vm.isEditingRuleNodeLink = false; - vm.editingRuleNodeLink = null; - vm.isEditingRuleNode = true; - vm.editingRuleNodeIndex = vm.ruleChainModel.nodes.indexOf(node); - vm.editingRuleNode = angular.copy(node); - $mdUtil.nextTick(() => { - if (vm.ruleNodeForm) { - vm.ruleNodeForm.$setPristine(); - } - }); - } + openNodeDetails(node); } }, isValidEdge: function (source, destination) { @@ -491,6 +550,38 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time } }; + function openNodeDetails(node) { + if (node.component.type != types.ruleNodeType.INPUT.value) { + vm.isEditingRuleNodeLink = false; + vm.editingRuleNodeLink = null; + vm.isEditingRuleNode = true; + vm.editingRuleNodeIndex = vm.ruleChainModel.nodes.indexOf(node); + vm.editingRuleNode = angular.copy(node); + $mdUtil.nextTick(() => { + if (vm.ruleNodeForm) { + vm.ruleNodeForm.$setPristine(); + } + }); + } + } + + function openLinkDetails(edge) { + var sourceNode = vm.modelservice.nodes.getNodeByConnectorId(edge.source); + if (sourceNode.component.type != types.ruleNodeType.INPUT.value) { + vm.isEditingRuleNode = false; + vm.editingRuleNode = null; + vm.editingRuleNodeLinkLabels = ruleChainService.getRuleNodeSupportedLinks(sourceNode.component); + vm.isEditingRuleNodeLink = true; + vm.editingRuleNodeLinkIndex = vm.ruleChainModel.edges.indexOf(edge); + vm.editingRuleNodeLink = angular.copy(edge); + $mdUtil.nextTick(() => { + if (vm.ruleNodeLinkForm) { + vm.ruleNodeLinkForm.$setPristine(); + } + }); + } + } + loadRuleChainLibrary(ruleNodeComponents, true); $scope.$watch('vm.ruleNodeSearch', diff --git a/ui/src/app/rulechain/rulechain.scss b/ui/src/app/rulechain/rulechain.scss index 68f042352a..b89557be77 100644 --- a/ui/src/app/rulechain/rulechain.scss +++ b/ui/src/app/rulechain/rulechain.scss @@ -113,6 +113,9 @@ font-size: 14px; display: flex; flex-direction: row; + &.tb-rulechain { + background-color: #aac7e4; + } &.tb-link { background-color: #aac7e4; } @@ -124,6 +127,7 @@ font-weight: 500; } .tb-context-menu-subtitle { + font-size: 12px; } } } diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 8a8dcc54ea..59fdbadca9 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -99,7 +99,7 @@ - +
Date: Fri, 6 Apr 2018 23:01:26 +0300 Subject: [PATCH 66/75] Rule Chain UI: Context menu support. --- ui/src/app/rulechain/rulechain.tpl.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 59fdbadca9..51d8d716e0 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -121,13 +121,15 @@
{{vm.contextInfo.subtitle}}
- - - {{item.icon}} - {{item.value}} - {{ item.shortcut | keyboardShortcut }} - - +
+ + + {{item.icon}} + {{item.value}} + {{ item.shortcut | keyboardShortcut }} + + +
From 737f2cc92a3ef3daaeaa6c6c160d0d61141d4d9d Mon Sep 17 00:00:00 2001 From: vparomskiy Date: Wed, 11 Apr 2018 16:19:14 +0300 Subject: [PATCH 67/75] add Log and Alarm nodes --- .../actors/ruleChain/DefaultTbContext.java | 6 + .../service/script/NashornJsEngine.java | 11 + .../rule/engine/api/ScriptEngine.java | 5 + .../rule/engine/api/TbContext.java | 3 + .../rule/engine/action/TbAlarmNode.java | 215 +++++++++++ .../action/TbAlarmNodeConfiguration.java | 44 +++ .../rule/engine/action/TbLogNode.java | 64 ++++ .../engine/action/TbLogNodeConfiguration.java | 32 ++ .../rule/engine/action/TbAlarmNodeTest.java | 341 ++++++++++++++++++ 9 files changed, 721 insertions(+) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index d3fdc94c8e..9b6e4ba954 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -24,6 +24,7 @@ import org.thingsboard.rule.engine.api.ScriptEngine; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; @@ -119,6 +120,11 @@ class DefaultTbContext implements TbContext { return nodeCtx.getSelf().getId(); } + @Override + public TenantId getTenantId() { + return nodeCtx.getTenantId(); + } + @Override public void tellNext(TbMsg msg, Set relationTypes) { relationTypes.forEach(type -> tellNext(msg, type)); diff --git a/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java b/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java index 38add44569..b9583f04db 100644 --- a/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java +++ b/application/src/main/java/org/thingsboard/server/service/script/NashornJsEngine.java @@ -145,6 +145,17 @@ public class NashornJsEngine implements org.thingsboard.rule.engine.api.ScriptEn return unbindMsg(result, prevMsg); } + @Override + public JsonNode executeJson(TbMsg msg) throws ScriptException { + return executeScript(msg); + } + + @Override + public String executeToString(TbMsg msg) throws ScriptException { + JsonNode result = executeScript(msg); + return result.asText(); + } + @Override public boolean executeFilter(TbMsg msg) throws ScriptException { JsonNode result = executeScript(msg); diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java index c2c8210f80..1db046af39 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java @@ -15,6 +15,7 @@ */ package org.thingsboard.rule.engine.api; +import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.common.msg.TbMsg; import javax.script.ScriptException; @@ -30,6 +31,10 @@ public interface ScriptEngine { Set executeSwitch(TbMsg msg) throws ScriptException; + JsonNode executeJson(TbMsg msg) throws ScriptException; + + String executeToString(TbMsg msg) throws ScriptException; + void destroy(); } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index b8c2b3888c..258b173bb5 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -16,6 +16,7 @@ package org.thingsboard.rule.engine.api; import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; @@ -59,6 +60,8 @@ public interface TbContext { RuleNodeId getSelfId(); + TenantId getTenantId(); + AttributesService getAttributesService(); CustomerService getCustomerService(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java new file mode 100644 index 0000000000..97d54774ce --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java @@ -0,0 +1,215 @@ +/** + * Copyright © 2016-2018 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.rule.engine.action; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Function; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.alarm.Alarm; +import org.thingsboard.server.common.data.alarm.AlarmStatus; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "alarm", relationTypes = {"Created", "Updated", "Cleared", "False"}, + configClazz = TbAlarmNodeConfiguration.class, + nodeDescription = "Create/Update/Clear Alarm", + nodeDetails = "isAlarm - JS function that verifies if Alarm should be CREATED for incoming message.\n" + + "isCleared - JS function that verifies if Alarm should be CLEARED for incoming message.\n" + + "Details - JS function that creates JSON object based on incoming message. This object will be added into Alarm.details field.\n" + + "Node output:\n" + + "If alarm was not created, original message is returned. Otherwise new Message returned with type 'ALARM', Alarm object in 'msg' property and 'matadata' will contains one of those properties 'isNewAlarm/isExistingAlarm/isClearedAlarm' " + + "Message payload can be accessed via msg property. For example 'temperature = ' + msg.temperature ;" + + "Message metadata can be accessed via metadata property. For example 'name = ' + metadata.customerName;", + uiResources = {"static/rulenode/rulenode-core-config.js"}) + +public class TbAlarmNode implements TbNode { + + static final String IS_NEW_ALARM = "isNewAlarm"; + static final String IS_EXISTING_ALARM = "isExistingAlarm"; + static final String IS_CLEARED_ALARM = "isClearedAlarm"; + + private final ObjectMapper mapper = new ObjectMapper(); + + private TbAlarmNodeConfiguration config; + private ScriptEngine createJsEngine; + private ScriptEngine clearJsEngine; + private ScriptEngine buildDetailsJsEngine; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbAlarmNodeConfiguration.class); + this.createJsEngine = ctx.createJsScriptEngine(config.getCreateConditionJs(), "isAlarm"); + this.clearJsEngine = ctx.createJsScriptEngine(config.getClearConditionJs(), "isCleared"); + this.buildDetailsJsEngine = ctx.createJsScriptEngine(config.getAlarmDetailsBuildJs(), "Details"); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + ListeningExecutor jsExecutor = ctx.getJsExecutor(); + + ListenableFuture shouldCreate = jsExecutor.executeAsync(() -> createJsEngine.executeFilter(msg)); + ListenableFuture transform = Futures.transform(shouldCreate, (AsyncFunction) create -> { + if (create) { + return createOrUpdate(ctx, msg); + } else { + return checkForClearIfExist(ctx, msg); + } + }); + + withCallback(transform, + alarmResult -> { + if (alarmResult.alarm == null) { + ctx.tellNext(msg, "False"); + } else if (alarmResult.isCreated) { + ctx.tellNext(toAlarmMsg(alarmResult, msg), "Created"); + } else if (alarmResult.isUpdated) { + ctx.tellNext(toAlarmMsg(alarmResult, msg), "Updated"); + } else if (alarmResult.isCleared) { + ctx.tellNext(toAlarmMsg(alarmResult, msg), "Cleared"); + } + }, + t -> ctx.tellError(msg, t)); + + } + + private ListenableFuture createOrUpdate(TbContext ctx, TbMsg msg) { + ListenableFuture latest = ctx.getAlarmService().findLatestByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), config.getAlarmType()); + return Futures.transform(latest, (AsyncFunction) a -> { + if (a == null || a.getStatus().isCleared()) { + return createNewAlarm(ctx, msg); + } else { + return updateAlarm(ctx, msg, a); + } + }); + } + + private ListenableFuture checkForClearIfExist(TbContext ctx, TbMsg msg) { + ListenableFuture latest = ctx.getAlarmService().findLatestByOriginatorAndType(ctx.getTenantId(), msg.getOriginator(), config.getAlarmType()); + return Futures.transform(latest, (AsyncFunction) a -> { + if (a != null && !a.getStatus().isCleared()) { + return clearAlarm(ctx, msg, a); + } + return Futures.immediateFuture(new AlarmResult(false, false, false, null)); + }); + } + + private ListenableFuture createNewAlarm(TbContext ctx, TbMsg msg) { + ListenableFuture asyncAlarm = Futures.transform(buildAlarmDetails(ctx, msg), (Function) details -> buildAlarm(msg, details, ctx.getTenantId())); + ListenableFuture asyncCreated = Futures.transform(asyncAlarm, (Function) alarm -> ctx.getAlarmService().createOrUpdateAlarm(alarm)); + return Futures.transform(asyncCreated, (Function) alarm -> new AlarmResult(true, false, false, alarm)); + } + + private ListenableFuture updateAlarm(TbContext ctx, TbMsg msg, Alarm alarm) { + ListenableFuture asyncUpdated = Futures.transform(buildAlarmDetails(ctx, msg), (Function) details -> { + alarm.setSeverity(config.getSeverity()); + alarm.setPropagate(config.isPropagate()); + alarm.setDetails(details); + alarm.setEndTs(System.currentTimeMillis()); + return ctx.getAlarmService().createOrUpdateAlarm(alarm); + }); + + return Futures.transform(asyncUpdated, (Function) a -> new AlarmResult(false, true, false, a)); + } + + private ListenableFuture clearAlarm(TbContext ctx, TbMsg msg, Alarm alarm) { + ListenableFuture shouldClear = ctx.getJsExecutor().executeAsync(() -> clearJsEngine.executeFilter(msg)); + return Futures.transform(shouldClear, (AsyncFunction) clear -> { + if (clear) { + ListenableFuture clearFuture = ctx.getAlarmService().clearAlarm(alarm.getId(), System.currentTimeMillis()); + return Futures.transform(clearFuture, (Function) cleared -> { + alarm.setStatus(alarm.getStatus().isAck() ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK); + return new AlarmResult(false, false, true, alarm); + }); + } + return Futures.immediateFuture(new AlarmResult(false, false, false, null)); + }); + } + + private Alarm buildAlarm(TbMsg msg, JsonNode details, TenantId tenantId) { + return Alarm.builder() + .tenantId(tenantId) + .originator(msg.getOriginator()) + .status(AlarmStatus.ACTIVE_UNACK) + .severity(config.getSeverity()) + .propagate(config.isPropagate()) + .type(config.getAlarmType()) + //todo-vp: alarm date should be taken from Message or current Time should be used? +// .startTs(System.currentTimeMillis()) +// .endTs(System.currentTimeMillis()) + .details(details) + .build(); + } + + private ListenableFuture buildAlarmDetails(TbContext ctx, TbMsg msg) { + return ctx.getJsExecutor().executeAsync(() -> buildDetailsJsEngine.executeJson(msg)); + } + + private TbMsg toAlarmMsg(AlarmResult alarmResult, TbMsg originalMsg) { + JsonNode jsonNodes = mapper.valueToTree(alarmResult.alarm); + String data = jsonNodes.toString(); + TbMsgMetaData metaData = originalMsg.getMetaData().copy(); + if (alarmResult.isCreated) { + metaData.putValue(IS_NEW_ALARM, Boolean.TRUE.toString()); + } else if (alarmResult.isUpdated) { + metaData.putValue(IS_EXISTING_ALARM, Boolean.TRUE.toString()); + } else if (alarmResult.isCleared) { + metaData.putValue(IS_CLEARED_ALARM, Boolean.TRUE.toString()); + } + return new TbMsg(UUIDs.timeBased(), "ALARM", originalMsg.getOriginator(), metaData, data); + } + + + @Override + public void destroy() { + if (createJsEngine != null) { + createJsEngine.destroy(); + } + if (clearJsEngine != null) { + clearJsEngine.destroy(); + } + if (buildDetailsJsEngine != null) { + buildDetailsJsEngine.destroy(); + } + } + + private static class AlarmResult { + boolean isCreated; + boolean isUpdated; + boolean isCleared; + Alarm alarm; + + AlarmResult(boolean isCreated, boolean isUpdated, boolean isCleared, Alarm alarm) { + this.isCreated = isCreated; + this.isUpdated = isUpdated; + this.isCleared = isCleared; + this.alarm = alarm; + } + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNodeConfiguration.java new file mode 100644 index 0000000000..3575459854 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNodeConfiguration.java @@ -0,0 +1,44 @@ +/** + * Copyright © 2016-2018 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.rule.engine.action; + +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.alarm.AlarmSeverity; + +@Data +public class TbAlarmNodeConfiguration implements NodeConfiguration { + + private String createConditionJs; + private String clearConditionJs; + private String alarmDetailsBuildJs; + private String alarmType; + private AlarmSeverity severity; + private boolean propagate; + + + @Override + public TbAlarmNodeConfiguration defaultConfiguration() { + TbAlarmNodeConfiguration configuration = new TbAlarmNodeConfiguration(); + configuration.setCreateConditionJs("return 'incoming message = ' + msg + meta;"); + configuration.setClearConditionJs("return 'incoming message = ' + msg + meta;"); + configuration.setAlarmDetailsBuildJs("return 'incoming message = ' + msg + meta;"); + configuration.setAlarmType("General Alarm"); + configuration.setSeverity(AlarmSeverity.CRITICAL); + configuration.setPropagate(false); + return configuration; + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java new file mode 100644 index 0000000000..8dbbf089ff --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java @@ -0,0 +1,64 @@ +/** + * Copyright © 2016-2018 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.rule.engine.action; + +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; + +import static org.thingsboard.rule.engine.DonAsynchron.withCallback; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "log", + configClazz = TbLogNodeConfiguration.class, + nodeDescription = "Log incoming messages using JS script for transformation Message into String", + nodeDetails = "Transform incoming Message with configured JS condition to String and log final value. " + + "Message payload can be accessed via msg property. For example 'temperature = ' + msg.temperature ;" + + "Message metadata can be accessed via metadata property. For example 'name = ' + metadata.customerName;") + +public class TbLogNode implements TbNode { + + private TbLogNodeConfiguration config; + private ScriptEngine jsEngine; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbLogNodeConfiguration.class); + this.jsEngine = ctx.createJsScriptEngine(config.getJsScript(), "ToString"); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + ListeningExecutor jsExecutor = ctx.getJsExecutor(); + withCallback(jsExecutor.executeAsync(() -> jsEngine.executeToString(msg)), + toString -> { + log.info(toString); + ctx.tellNext(msg); + }, + t -> ctx.tellError(msg, t)); + } + + @Override + public void destroy() { + if (jsEngine != null) { + jsEngine.destroy(); + } + } +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNodeConfiguration.java new file mode 100644 index 0000000000..aafb7f12c1 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNodeConfiguration.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2018 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.rule.engine.action; + +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; + +@Data +public class TbLogNodeConfiguration implements NodeConfiguration { + + private String jsScript; + + @Override + public TbLogNodeConfiguration defaultConfiguration() { + TbLogNodeConfiguration configuration = new TbLogNodeConfiguration(); + configuration.setJsScript("return 'incoming message = ' + msg + meta;"); + return configuration; + } +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java new file mode 100644 index 0000000000..69c3aca2d2 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java @@ -0,0 +1,341 @@ +/** + * Copyright © 2016-2018 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.rule.engine.action; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.apache.commons.lang3.NotImplementedException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.alarm.Alarm; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.dao.alarm.AlarmService; + +import javax.script.ScriptException; +import java.io.IOException; +import java.util.concurrent.Callable; + +import static org.junit.Assert.*; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.*; +import static org.thingsboard.rule.engine.action.TbAlarmNode.*; +import static org.thingsboard.server.common.data.alarm.AlarmSeverity.CRITICAL; +import static org.thingsboard.server.common.data.alarm.AlarmSeverity.WARNING; +import static org.thingsboard.server.common.data.alarm.AlarmStatus.*; + +@RunWith(MockitoJUnitRunner.class) +public class TbAlarmNodeTest { + + private TbAlarmNode node; + + @Mock + private TbContext ctx; + @Mock + private ListeningExecutor executor; + @Mock + private AlarmService alarmService; + + @Mock + private ScriptEngine createJs; + @Mock + private ScriptEngine clearJs; + @Mock + private ScriptEngine detailsJs; + + private EntityId originator = new DeviceId(UUIDs.timeBased()); + private TenantId tenantId = new TenantId(UUIDs.timeBased()); + private TbMsgMetaData metaData = new TbMsgMetaData(); + private String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; + + @Test + public void newAlarmCanBeCreated() throws ScriptException, IOException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + when(createJs.executeFilter(msg)).thenReturn(true); + when(detailsJs.executeJson(msg)).thenReturn(null); + when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null)); + + doAnswer((Answer) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class)); + + node.onMsg(ctx, msg); + + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture(), eq("Created")); + TbMsg actualMsg = captor.getValue(); + + assertEquals("ALARM", actualMsg.getType()); + assertEquals(originator, actualMsg.getOriginator()); + assertEquals("value", actualMsg.getMetaData().getValue("key")); + assertEquals(Boolean.TRUE.toString(), actualMsg.getMetaData().getValue(IS_NEW_ALARM)); + assertNotSame(metaData, actualMsg.getMetaData()); + + Alarm actualAlarm = new ObjectMapper().readValue(actualMsg.getData().getBytes(), Alarm.class); + Alarm expectedAlarm = Alarm.builder() + .tenantId(tenantId) + .originator(originator) + .status(ACTIVE_UNACK) + .severity(CRITICAL) + .propagate(true) + .type("SomeType") + .details(null) + .build(); + + assertEquals(expectedAlarm, actualAlarm); + + verify(executor, times(2)).executeAsync(any(Callable.class)); + } + + @Test + public void shouldCreateScriptThrowsException() throws ScriptException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + when(createJs.executeFilter(msg)).thenThrow(new NotImplementedException("message")); + + node.onMsg(ctx, msg); + + verifyError(msg, "message", NotImplementedException.class); + + + verify(ctx).createJsScriptEngine("CREATE", "isAlarm"); + verify(ctx).createJsScriptEngine("CLEAR", "isCleared"); + verify(ctx).createJsScriptEngine("DETAILS", "Details"); + verify(ctx).getJsExecutor(); + + verifyNoMoreInteractions(ctx, alarmService, clearJs, detailsJs); + } + + @Test + public void buildDetailsThrowsException() throws ScriptException, IOException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + when(createJs.executeFilter(msg)).thenReturn(true); + when(detailsJs.executeJson(msg)).thenThrow(new NotImplementedException("message")); + when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(null)); + + node.onMsg(ctx, msg); + + verifyError(msg, "message", NotImplementedException.class); + + verify(ctx).createJsScriptEngine("CREATE", "isAlarm"); + verify(ctx).createJsScriptEngine("CLEAR", "isCleared"); + verify(ctx).createJsScriptEngine("DETAILS", "Details"); + verify(ctx, times(2)).getJsExecutor(); + verify(ctx).getAlarmService(); + verify(ctx).getTenantId(); + verify(alarmService).findLatestByOriginatorAndType(tenantId, originator, "SomeType"); + + verifyNoMoreInteractions(ctx, alarmService, clearJs); + } + + @Test + public void ifAlarmClearedCreateNew() throws ScriptException, IOException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + Alarm clearedAlarm = Alarm.builder().status(CLEARED_ACK).build(); + + when(createJs.executeFilter(msg)).thenReturn(true); + when(detailsJs.executeJson(msg)).thenReturn(null); + when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(clearedAlarm)); + + doAnswer((Answer) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(any(Alarm.class)); + + node.onMsg(ctx, msg); + + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture(), eq("Created")); + TbMsg actualMsg = captor.getValue(); + + assertEquals("ALARM", actualMsg.getType()); + assertEquals(originator, actualMsg.getOriginator()); + assertEquals("value", actualMsg.getMetaData().getValue("key")); + assertEquals(Boolean.TRUE.toString(), actualMsg.getMetaData().getValue(IS_NEW_ALARM)); + assertNotSame(metaData, actualMsg.getMetaData()); + + Alarm actualAlarm = new ObjectMapper().readValue(actualMsg.getData().getBytes(), Alarm.class); + Alarm expectedAlarm = Alarm.builder() + .tenantId(tenantId) + .originator(originator) + .status(ACTIVE_UNACK) + .severity(CRITICAL) + .propagate(true) + .type("SomeType") + .details(null) + .build(); + + assertEquals(expectedAlarm, actualAlarm); + + verify(executor, times(2)).executeAsync(any(Callable.class)); + } + + @Test + public void alarmCanBeUpdated() throws ScriptException, IOException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + long oldEndDate = System.currentTimeMillis(); + Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).status(ACTIVE_UNACK).severity(WARNING).endTs(oldEndDate).build(); + + when(createJs.executeFilter(msg)).thenReturn(true); + when(clearJs.executeFilter(msg)).thenReturn(false); + when(detailsJs.executeJson(msg)).thenReturn(null); + when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(activeAlarm)); + + doAnswer((Answer) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(activeAlarm); + + node.onMsg(ctx, msg); + + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture(), eq("Updated")); + TbMsg actualMsg = captor.getValue(); + + assertEquals("ALARM", actualMsg.getType()); + assertEquals(originator, actualMsg.getOriginator()); + assertEquals("value", actualMsg.getMetaData().getValue("key")); + assertEquals(Boolean.TRUE.toString(), actualMsg.getMetaData().getValue(IS_EXISTING_ALARM)); + assertNotSame(metaData, actualMsg.getMetaData()); + + Alarm actualAlarm = new ObjectMapper().readValue(actualMsg.getData().getBytes(), Alarm.class); + assertTrue(activeAlarm.getEndTs() > oldEndDate); + Alarm expectedAlarm = Alarm.builder() + .tenantId(tenantId) + .originator(originator) + .status(ACTIVE_UNACK) + .severity(CRITICAL) + .propagate(true) + .type("SomeType") + .details(null) + .endTs(activeAlarm.getEndTs()) + .build(); + + assertEquals(expectedAlarm, actualAlarm); + + verify(executor, times(2)).executeAsync(any(Callable.class)); + } + + @Test + public void alarmCanBeCleared() throws ScriptException, IOException { + initWithScript(); + metaData.putValue("key", "value"); + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson); + + long oldEndDate = System.currentTimeMillis(); + Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).status(ACTIVE_UNACK).severity(WARNING).endTs(oldEndDate).build(); + + when(createJs.executeFilter(msg)).thenReturn(false); + when(clearJs.executeFilter(msg)).thenReturn(true); +// when(detailsJs.executeJson(msg)).thenReturn(null); + when(alarmService.findLatestByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(Futures.immediateFuture(activeAlarm)); + when(alarmService.clearAlarm(eq(activeAlarm.getId()), anyLong())).thenReturn(Futures.immediateFuture(true)); +// doAnswer((Answer) invocationOnMock -> (Alarm) (invocationOnMock.getArguments())[0]).when(alarmService).createOrUpdateAlarm(activeAlarm); + + node.onMsg(ctx, msg); + + ArgumentCaptor captor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx).tellNext(captor.capture(), eq("Cleared")); + TbMsg actualMsg = captor.getValue(); + + assertEquals("ALARM", actualMsg.getType()); + assertEquals(originator, actualMsg.getOriginator()); + assertEquals("value", actualMsg.getMetaData().getValue("key")); + assertEquals(Boolean.TRUE.toString(), actualMsg.getMetaData().getValue(IS_CLEARED_ALARM)); + assertNotSame(metaData, actualMsg.getMetaData()); + + Alarm actualAlarm = new ObjectMapper().readValue(actualMsg.getData().getBytes(), Alarm.class); + Alarm expectedAlarm = Alarm.builder() + .tenantId(tenantId) + .originator(originator) + .status(CLEARED_UNACK) + .severity(WARNING) + .propagate(false) + .type("SomeType") + .details(null) + .endTs(oldEndDate) + .build(); + + assertEquals(expectedAlarm, actualAlarm); + } + + private void initWithScript() { + try { + TbAlarmNodeConfiguration config = new TbAlarmNodeConfiguration(); + config.setPropagate(true); + config.setSeverity(CRITICAL); + config.setAlarmType("SomeType"); + config.setCreateConditionJs("CREATE"); + config.setClearConditionJs("CLEAR"); + config.setAlarmDetailsBuildJs("DETAILS"); + ObjectMapper mapper = new ObjectMapper(); + TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); + + when(ctx.createJsScriptEngine("CREATE", "isAlarm")).thenReturn(createJs); + when(ctx.createJsScriptEngine("CLEAR", "isCleared")).thenReturn(clearJs); + when(ctx.createJsScriptEngine("DETAILS", "Details")).thenReturn(detailsJs); + + when(ctx.getTenantId()).thenReturn(tenantId); + when(ctx.getJsExecutor()).thenReturn(executor); + when(ctx.getAlarmService()).thenReturn(alarmService); + + mockJsExecutor(); + + node = new TbAlarmNode(); + node.init(ctx, nodeConfiguration); + } catch (TbNodeException ex) { + throw new IllegalStateException(ex); + } + } + + private void mockJsExecutor() { + when(ctx.getJsExecutor()).thenReturn(executor); + doAnswer((Answer>) invocationOnMock -> { + try { + Callable task = (Callable) (invocationOnMock.getArguments())[0]; + return Futures.immediateFuture((Boolean) task.call()); + } catch (Throwable th) { + return Futures.immediateFailedFuture(th); + } + }).when(executor).executeAsync(any(Callable.class)); + } + + private void verifyError(TbMsg msg, String message, Class expectedClass) { + ArgumentCaptor captor = ArgumentCaptor.forClass(Throwable.class); + verify(ctx).tellError(same(msg), captor.capture()); + + Throwable value = captor.getValue(); + assertEquals(expectedClass, value.getClass()); + assertEquals(message, value.getMessage()); + } + +} \ No newline at end of file From b13d666f1b2bfa8eaab3e7a325f18f0bac7ba51e Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 11 Apr 2018 22:12:52 +0300 Subject: [PATCH 68/75] Rule Chain UI: Copy/Paste support. --- ui/src/app/locale/locale.constant.js | 1 + ui/src/app/rulechain/rulechain.controller.js | 152 ++++++++++++++++++- ui/src/app/rulechain/rulechain.scss | 3 + ui/src/app/rulechain/rulechain.tpl.html | 3 +- ui/src/app/services/item-buffer.service.js | 71 ++++++++- 5 files changed, 225 insertions(+), 5 deletions(-) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index bd5858f688..c515e3e630 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1208,6 +1208,7 @@ export default angular.module('thingsboard.locale', []) "delete-selected-objects": "Delete selected nodes and connections", "delete-selected": "Delete selected", "select-all": "Select all", + "copy-selected": "Copy selected", "deselect-all": "Deselect all", "rulenode-details": "Rule node details", "debug-mode": "Debug mode", diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index f6572163dd..d77d644577 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -29,7 +29,7 @@ import addRuleNodeLinkTemplate from './add-link.tpl.html'; /*@ngInject*/ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $timeout, $mdExpansionPanel, $window, $document, $mdDialog, - $filter, $translate, hotkeys, types, ruleChainService, Modelfactory, flowchartConstants, + $filter, $translate, hotkeys, types, ruleChainService, itembuffer, Modelfactory, flowchartConstants, ruleChain, ruleChainMetaData, ruleNodeComponents) { var vm = this; @@ -140,6 +140,22 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time subtitle: $translate.instant('rulechain.rulechain') }; contextInfo.items = []; + contextInfo.items.push( + { + action: function ($event) { + pasteRuleNodes($event); + }, + enabled: itembuffer.hasRuleNodes(), + value: "action.paste", + icon: "content_paste", + shortcut: "M-V" + } + ); + contextInfo.items.push( + { + divider: true + } + ); if (objectsSelected()) { contextInfo.items.push( { @@ -152,6 +168,17 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time shortcut: "Esc" } ); + contextInfo.items.push( + { + action: function (event) { + copyRuleNodes(event); + }, + enabled: true, + value: "rulenode.copy-selected", + icon: "content_copy", + shortcut: "M-C" + } + ); contextInfo.items.push( { action: function () { @@ -176,6 +203,11 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time } ); } + contextInfo.items.push( + { + divider: true + } + ); contextInfo.items.push( { action: function () { @@ -220,6 +252,16 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time icon: "menu" } ); + contextInfo.items.push( + { + action: function (event) { + copyNode(event, node); + }, + enabled: true, + value: "action.copy", + icon: "content_copy" + } + ); contextInfo.items.push( { action: function () { @@ -526,7 +568,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time if (destNode.component.type == types.ruleNodeType.RULE_CHAIN.value) { deferred.reject(); } else { - var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}); + var res = $filter('filter')(vm.ruleChainModel.edges, {source: vm.inputConnectorId}, true); if (res && res.length) { vm.modelservice.edges.delete(res[0]); } @@ -582,6 +624,112 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time } } + function copyNode(event, node) { + var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); + var x = Math.round(event.clientX - offset.left); + var y = Math.round(event.clientY - offset.top); + itembuffer.copyRuleNodes(x, y, [node], []); + } + + function copyRuleNodes(event) { + var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); + var x = Math.round(event.clientX - offset.left); + var y = Math.round(event.clientY - offset.top); + var nodes = vm.modelservice.nodes.getSelectedNodes(); + var edges = vm.modelservice.edges.getSelectedEdges(); + var connections = []; + for (var i=0;i -1) && toIndex > -1 ) { + var connection = { + isInputSource: isInputSource, + fromIndex: fromIndex, + toIndex: toIndex, + label: edge.label + }; + connections.push(connection); + } + } + itembuffer.copyRuleNodes(x, y, nodes, connections); + } + + function pasteRuleNodes(event) { + var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); + var x = Math.round(event.clientX - offset.left); + var y = Math.round(event.clientY - offset.top); + var ruleNodes = itembuffer.pasteRuleNodes(x, y, event); + if (ruleNodes) { + vm.modelservice.deselectAll(); + var nodes = []; + for (var i=0;i
- + + {{item.icon}} {{item.value}} diff --git a/ui/src/app/services/item-buffer.service.js b/ui/src/app/services/item-buffer.service.js index 9fce81171a..d6a9ce7a32 100644 --- a/ui/src/app/services/item-buffer.service.js +++ b/ui/src/app/services/item-buffer.service.js @@ -24,10 +24,11 @@ export default angular.module('thingsboard.itembuffer', [angularStorage]) .name; /*@ngInject*/ -function ItemBuffer($q, bufferStore, types, utils, dashboardUtils) { +function ItemBuffer($q, bufferStore, types, utils, dashboardUtils, ruleChainService) { const WIDGET_ITEM = "widget_item"; const WIDGET_REFERENCE = "widget_reference"; + const RULE_NODES = "rule_nodes"; var service = { prepareWidgetItem: prepareWidgetItem, @@ -37,7 +38,10 @@ function ItemBuffer($q, bufferStore, types, utils, dashboardUtils) { canPasteWidgetReference: canPasteWidgetReference, pasteWidget: pasteWidget, pasteWidgetReference: pasteWidgetReference, - addWidgetToDashboard: addWidgetToDashboard + addWidgetToDashboard: addWidgetToDashboard, + copyRuleNodes: copyRuleNodes, + hasRuleNodes: hasRuleNodes, + pasteRuleNodes: pasteRuleNodes } return service; @@ -151,6 +155,69 @@ function ItemBuffer($q, bufferStore, types, utils, dashboardUtils) { }; } + function copyRuleNodes(x, y, nodes, connections) { + var ruleNodes = { + nodes: [], + connections: [], + originX: x, + originY: y + }; + for (var i=0;i Date: Thu, 12 Apr 2018 10:50:40 +0300 Subject: [PATCH 69/75] Improve Rule Chain UI edit. --- ui/src/app/rulechain/rulechain.controller.js | 85 ++++++++++++++------ ui/src/app/rulechain/rulechain.tpl.html | 4 +- ui/src/app/services/item-buffer.service.js | 20 ++++- 3 files changed, 77 insertions(+), 32 deletions(-) diff --git a/ui/src/app/rulechain/rulechain.controller.js b/ui/src/app/rulechain/rulechain.controller.js index d77d644577..c24f9c73f6 100644 --- a/ui/src/app/rulechain/rulechain.controller.js +++ b/ui/src/app/rulechain/rulechain.controller.js @@ -62,6 +62,12 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.isEditingRuleNodeLink = false; vm.isLibraryOpen = true; + + Object.defineProperty(vm, 'isLibraryOpenReadonly', { + get: function() { return vm.isLibraryOpen }, + set: function() {} + }); + vm.ruleNodeSearch = ''; vm.ruleChain = ruleChain; @@ -140,6 +146,19 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time subtitle: $translate.instant('rulechain.rulechain') }; contextInfo.items = []; + if (vm.modelservice.nodes.getSelectedNodes().length) { + contextInfo.items.push( + { + action: function () { + copyRuleNodes(); + }, + enabled: true, + value: "rulenode.copy-selected", + icon: "content_copy", + shortcut: "M-C" + } + ); + } contextInfo.items.push( { action: function ($event) { @@ -168,17 +187,6 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time shortcut: "Esc" } ); - contextInfo.items.push( - { - action: function (event) { - copyRuleNodes(event); - }, - enabled: true, - value: "rulenode.copy-selected", - icon: "content_copy", - shortcut: "M-C" - } - ); contextInfo.items.push( { action: function () { @@ -254,8 +262,8 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time ); contextInfo.items.push( { - action: function (event) { - copyNode(event, node); + action: function () { + copyNode(node); }, enabled: true, value: "action.copy", @@ -323,12 +331,33 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time vm.modelservice.selectAll(); } }) + .add({ + combo: 'ctrl+c', + description: $translate.instant('rulenode.copy-selected'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + copyRuleNodes(); + } + }) + .add({ + combo: 'ctrl+v', + description: $translate.instant('action.paste'), + allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], + callback: function (event) { + event.preventDefault(); + if (itembuffer.hasRuleNodes()) { + pasteRuleNodes(); + } + } + }) .add({ combo: 'esc', description: $translate.instant('rulenode.deselect-all-objects'), allowIn: ['INPUT', 'SELECT', 'TEXTAREA'], callback: function (event) { event.preventDefault(); + event.stopPropagation(); vm.modelservice.deselectAll(); } }) @@ -624,17 +653,11 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time } } - function copyNode(event, node) { - var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); - var x = Math.round(event.clientX - offset.left); - var y = Math.round(event.clientY - offset.top); - itembuffer.copyRuleNodes(x, y, [node], []); + function copyNode(node) { + itembuffer.copyRuleNodes([node], []); } - function copyRuleNodes(event) { - var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); - var x = Math.round(event.clientX - offset.left); - var y = Math.round(event.clientY - offset.top); + function copyRuleNodes() { var nodes = vm.modelservice.nodes.getSelectedNodes(); var edges = vm.modelservice.edges.getSelectedEdges(); var connections = []; @@ -655,13 +678,23 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time connections.push(connection); } } - itembuffer.copyRuleNodes(x, y, nodes, connections); + itembuffer.copyRuleNodes(nodes, connections); } function pasteRuleNodes(event) { - var offset = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()).offset(); - var x = Math.round(event.clientX - offset.left); - var y = Math.round(event.clientY - offset.top); + var canvas = angular.element(vm.canvasControl.modelservice.getCanvasHtmlElement()); + var x,y; + if (event) { + var offset = canvas.offset(); + x = Math.round(event.clientX - offset.left); + y = Math.round(event.clientY - offset.top); + } else { + var scrollParent = canvas.parent(); + var scrollTop = scrollParent.scrollTop(); + var scrollLeft = scrollParent.scrollLeft(); + x = scrollLeft + scrollParent.width()/2; + y = scrollTop + scrollParent.height()/2; + } var ruleNodes = itembuffer.pasteRuleNodes(x, y, event); if (ruleNodes) { vm.modelservice.deselectAll(); diff --git a/ui/src/app/rulechain/rulechain.tpl.html b/ui/src/app/rulechain/rulechain.tpl.html index 81e8aba00c..bc68eefe98 100644 --- a/ui/src/app/rulechain/rulechain.tpl.html +++ b/ui/src/app/rulechain/rulechain.tpl.html @@ -36,8 +36,8 @@
diff --git a/ui/src/app/services/item-buffer.service.js b/ui/src/app/services/item-buffer.service.js index d6a9ce7a32..a9fe348794 100644 --- a/ui/src/app/services/item-buffer.service.js +++ b/ui/src/app/services/item-buffer.service.js @@ -155,13 +155,12 @@ function ItemBuffer($q, bufferStore, types, utils, dashboardUtils, ruleChainServ }; } - function copyRuleNodes(x, y, nodes, connections) { + function copyRuleNodes(nodes, connections) { var ruleNodes = { nodes: [], - connections: [], - originX: x, - originY: y + connections: [] }; + var top = -1, left = -1, bottom = -1, right = -1; for (var i=0;i Date: Thu, 12 Apr 2018 10:57:48 +0300 Subject: [PATCH 70/75] move exception to api move MailService to RuleEngine implement MsgToEmil Transformer and SendEmail Node --- .../server/actors/ActorSystemContext.java | 13 +- .../actors/ruleChain/DefaultTbContext.java | 15 +- .../ThingsboardSecurityConfiguration.java | 2 - .../server/config/WebSocketConfiguration.java | 4 +- .../server/controller/AdminController.java | 4 +- .../server/controller/AlarmController.java | 4 +- .../server/controller/AssetController.java | 4 +- .../server/controller/AuditLogController.java | 2 +- .../server/controller/AuthController.java | 6 +- .../server/controller/BaseController.java | 8 +- .../ComponentDescriptorController.java | 2 +- .../server/controller/CustomerController.java | 2 +- .../controller/DashboardController.java | 4 +- .../server/controller/DeviceController.java | 5 +- .../controller/EntityRelationController.java | 4 +- .../server/controller/EventController.java | 4 +- .../server/controller/PluginController.java | 2 +- .../controller/RuleChainController.java | 4 +- .../server/controller/RuleController.java | 2 +- .../controller/TelemetryController.java | 2 +- .../server/controller/TenantController.java | 2 +- .../server/controller/UserController.java | 6 +- .../controller/WidgetTypeController.java | 2 +- .../controller/WidgetsBundleController.java | 2 +- .../plugin/PluginApiController.java | 21 --- .../exception/ThingsboardErrorResponse.java | 1 + .../ThingsboardErrorResponseHandler.java | 4 +- .../service/mail/DefaultMailService.java | 100 +++++++----- .../service/mail/MailExecutorService.java | 54 +++++++ .../service/security/AccessValidator.java | 2 +- .../src/main/resources/thingsboard.yml | 1 + .../server/service/mail/TestMailService.java | 3 +- .../service/script/NashornJsEngineTest.java | 151 ++++++++++++++++++ .../thingsboard/server/common/data/User.java | 4 + .../data}/exception/ThingsboardErrorCode.java | 2 +- .../data}/exception/ThingsboardException.java | 2 +- .../server/common/msg/TbMsgMetaData.java | 4 + .../rule/engine/api}/MailService.java | 10 +- .../rule/engine/api/TbContext.java | 4 + rule-engine/rule-engine-components/pom.xml | 10 ++ .../rule/engine/mail/EmailPojo.java | 32 ++++ .../rule/engine/mail/RuleVelocityUtils.java | 68 ++++++++ .../rule/engine/mail/TbMsgToEmailNode.java | 114 +++++++++++++ .../mail/TbMsgToEmailNodeConfiguration.java | 41 +++++ .../rule/engine/mail/TbSendEmailNode.java | 89 +++++++++++ .../mail/TbSendEmailNodeConfiguration.java | 32 ++++ .../engine/metadata/TbGetAttributesNode.java | 8 +- .../engine/filter/TbJsFilterNodeTest.java | 85 +++------- .../engine/filter/TbJsSwitchNodeTest.java | 54 ++----- .../engine/mail/TbMsgToEmailNodeTest.java | 98 ++++++++++++ .../transform/TbTransformMsgNodeTest.java | 57 +++---- 51 files changed, 895 insertions(+), 261 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/service/mail/MailExecutorService.java create mode 100644 application/src/test/java/org/thingsboard/server/service/script/NashornJsEngineTest.java rename {application/src/main/java/org/thingsboard/server => common/data/src/main/java/org/thingsboard/server/common/data}/exception/ThingsboardErrorCode.java (95%) rename {application/src/main/java/org/thingsboard/server => common/data/src/main/java/org/thingsboard/server/common/data}/exception/ThingsboardException.java (96%) rename {application/src/main/java/org/thingsboard/server/service/mail => rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api}/MailService.java (80%) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/EmailPojo.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/RuleVelocityUtils.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNodeConfiguration.java create mode 100644 rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index b2496c0875..7c7747cec3 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.thingsboard.rule.engine.api.ListeningExecutor; +import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; @@ -58,6 +59,8 @@ import org.thingsboard.server.service.cluster.discovery.DiscoveryService; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import org.thingsboard.server.service.component.ComponentDiscoveryService; +import org.thingsboard.server.service.mail.MailExecutorService; +import org.thingsboard.server.service.script.JsExecutorService; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; import java.io.IOException; @@ -164,7 +167,15 @@ public class ActorSystemContext { @Autowired @Getter - private ListeningExecutor jsExecutor; + private JsExecutorService jsExecutor; + + @Autowired + @Getter + private MailExecutorService mailExecutor; + + @Autowired + @Getter + private MailService mailService; @Value("${actors.session.sync.timeout}") @Getter diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index 9b6e4ba954..4ff75bf2a3 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -18,10 +18,7 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.ActorRef; import akka.actor.Cancellable; import com.google.common.base.Function; -import org.thingsboard.rule.engine.api.ListeningExecutor; -import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; -import org.thingsboard.rule.engine.api.ScriptEngine; -import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.*; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; @@ -135,6 +132,11 @@ class DefaultTbContext implements TbContext { return mainCtx.getJsExecutor(); } + @Override + public ListeningExecutor getMailExecutor() { + return mainCtx.getMailExecutor(); + } + @Override public ScriptEngine createJsScriptEngine(String script, String functionName, String... argNames) { return new NashornJsEngine(script, functionName, argNames); @@ -194,4 +196,9 @@ class DefaultTbContext implements TbContext { public RelationService getRelationService() { return mainCtx.getRelationService(); } + + @Override + public MailService getMailService() { + return mainCtx.getMailService(); + } } diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java index 2952529812..24c533c59d 100644 --- a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; @@ -37,7 +36,6 @@ import org.springframework.security.web.authentication.AuthenticationFailureHand import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import org.springframework.web.cors.CorsUtils; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.thingsboard.server.dao.audit.AuditLogLevelFilter; diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java index d44c50e9cd..2e5050a9ad 100644 --- a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java @@ -17,8 +17,8 @@ package org.thingsboard.server.config; import java.util.Map; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.controller.plugin.TbWebSocketHandler; import org.thingsboard.server.service.security.model.SecurityUser; import org.springframework.context.annotation.Bean; diff --git a/application/src/main/java/org/thingsboard/server/controller/AdminController.java b/application/src/main/java/org/thingsboard/server/controller/AdminController.java index e9a6ba3816..5a43125bbf 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java @@ -20,8 +20,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.dao.settings.AdminSettingsService; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.service.mail.MailService; +import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.server.service.update.UpdateService; import org.thingsboard.server.service.update.model.UpdateMessage; diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java index 1959f4e528..81bcf7e765 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java @@ -23,8 +23,8 @@ import org.thingsboard.server.common.data.alarm.*; import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; @RestController @RequestMapping("/api") diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetController.java b/application/src/main/java/org/thingsboard/server/controller/AssetController.java index 9b439133d3..0e348f997e 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java @@ -33,8 +33,8 @@ import org.thingsboard.server.common.data.asset.AssetSearchQuery; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.service.security.model.SecurityUser; import java.util.ArrayList; diff --git a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java index 75bcf2ab15..e8685c74f9 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java @@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.UUID; diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java index ef38d802ec..96ff5162c7 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java @@ -28,9 +28,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.security.UserCredentials; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.service.mail.MailService; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository; import org.thingsboard.server.service.security.model.SecurityUser; import org.thingsboard.server.service.security.model.UserPrincipal; diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index 3294d5fc59..c7574e86ba 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.controller; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -30,7 +27,6 @@ import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmId; import org.thingsboard.server.common.data.alarm.AlarmInfo; import org.thingsboard.server.common.data.asset.Asset; -import org.thingsboard.server.common.data.audit.ActionStatus; import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.page.TextPageLink; @@ -61,9 +57,9 @@ import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.widget.WidgetTypeService; import org.thingsboard.server.dao.widget.WidgetsBundleService; -import org.thingsboard.server.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; import org.thingsboard.server.exception.ThingsboardErrorResponseHandler; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.service.component.ComponentDiscoveryService; import org.thingsboard.server.service.security.model.SecurityUser; diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java index 7a43cd35a2..6313d615a3 100644 --- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java +++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java @@ -19,7 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentType; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.HashSet; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java index b16470216a..7763f3c00a 100644 --- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java +++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java @@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; @RestController @RequestMapping("/api") diff --git a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java index d2952a16cb..4ec2bbab05 100644 --- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java +++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java @@ -27,9 +27,7 @@ import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; -import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.HashSet; import java.util.Set; diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java index bceea54135..1f4b02a88b 100644 --- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java +++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java @@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.EntitySubtype; import org.thingsboard.server.common.data.EntityType; -import org.thingsboard.server.common.data.audit.ActionStatus; import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.device.DeviceSearchQuery; import org.thingsboard.server.common.data.id.CustomerId; @@ -35,8 +34,8 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.service.security.model.SecurityUser; import java.util.ArrayList; diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java index 03054df985..3a3b78b52f 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java @@ -24,8 +24,8 @@ import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntityRelationInfo; import org.thingsboard.server.common.data.relation.RelationTypeGroup; import org.thingsboard.server.common.data.relation.EntityRelationsQuery; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/EventController.java b/application/src/main/java/org/thingsboard/server/controller/EventController.java index 331b15eb09..f67f113144 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EventController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EventController.java @@ -24,8 +24,8 @@ import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.dao.event.EventService; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; @RestController @RequestMapping("/api") diff --git a/application/src/main/java/org/thingsboard/server/controller/PluginController.java b/application/src/main/java/org/thingsboard/server/controller/PluginController.java index ed1760057b..3bc385d7b2 100644 --- a/application/src/main/java/org/thingsboard/server/controller/PluginController.java +++ b/application/src/main/java/org/thingsboard/server/controller/PluginController.java @@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index f69ad819ba..f20ff8f915 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -28,20 +28,18 @@ import org.springframework.web.bind.annotation.*; import org.thingsboard.rule.engine.api.ScriptEngine; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.audit.ActionType; -import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; -import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.service.script.NashornJsEngine; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleController.java b/application/src/main/java/org/thingsboard/server/controller/RuleController.java index 9a269029b5..4528d814a5 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleController.java @@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.common.data.security.Authority; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index 6ff8287b29..80ddc2ba32 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -58,7 +58,7 @@ import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; import org.thingsboard.server.common.transport.adaptor.JsonConverter; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.timeseries.TimeseriesService; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.extensions.api.exception.InvalidParametersException; import org.thingsboard.server.extensions.api.exception.UncheckedApiException; import org.thingsboard.server.extensions.api.plugins.PluginConstants; diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantController.java b/application/src/main/java/org/thingsboard/server/controller/TenantController.java index 5acb4eb216..bf49074f91 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TenantController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TenantController.java @@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.tenant.TenantService; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; @RestController @RequestMapping("/api") diff --git a/application/src/main/java/org/thingsboard/server/controller/UserController.java b/application/src/main/java/org/thingsboard/server/controller/UserController.java index 2a1531ac99..52b207db74 100644 --- a/application/src/main/java/org/thingsboard/server/controller/UserController.java +++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java @@ -29,9 +29,9 @@ import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.UserCredentials; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.service.mail.MailService; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.server.service.security.model.SecurityUser; import javax.servlet.http.HttpServletRequest; diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java index 44c7d94b3d..43ece89420 100644 --- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java +++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.WidgetTypeId; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java index 757f765dce..bf89f13a1c 100644 --- a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java +++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import java.util.List; diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java index 045835e1b6..8d25db3702 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java @@ -17,31 +17,10 @@ package org.thingsboard.server.controller.plugin; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.RequestEntity; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.async.DeferredResult; -import org.thingsboard.server.actors.service.ActorService; -import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.id.UserId; -import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.controller.BaseController; -import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.plugin.PluginService; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; import org.thingsboard.server.extensions.api.plugins.PluginConstants; -import org.thingsboard.server.extensions.api.plugins.rest.BasicPluginRestMsg; -import org.thingsboard.server.extensions.api.plugins.rest.RestRequest; - -import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(PluginConstants.PLUGIN_URL_PREFIX) diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java index 3b897d6bb3..031073fa97 100644 --- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java +++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java @@ -16,6 +16,7 @@ package org.thingsboard.server.exception; import org.springframework.http.HttpStatus; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; import java.util.Date; diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java index c70c5612c3..63fe17ac4f 100644 --- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java +++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java @@ -17,8 +17,6 @@ package org.thingsboard.server.exception; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -27,6 +25,8 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException; import org.thingsboard.server.service.security.exception.JwtExpiredTokenException; diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java index 25b911c2d5..818c935595 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java @@ -27,13 +27,15 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; import org.springframework.ui.velocity.VelocityEngineUtils; +import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.server.common.data.AdminSettings; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.settings.AdminSettingsService; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; import javax.annotation.PostConstruct; +import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import java.util.HashMap; import java.util.Locale; @@ -49,18 +51,18 @@ public class DefaultMailService implements MailService { public static final String UTF_8 = "UTF-8"; @Autowired private MessageSource messages; - + @Autowired @Qualifier("velocityEngine") private VelocityEngine engine; - + private JavaMailSenderImpl mailSender; - + private String mailFrom; - + @Autowired - private AdminSettingsService adminSettingsService; - + private AdminSettingsService adminSettingsService; + @PostConstruct private void init() { updateMailConfiguration(); @@ -77,7 +79,7 @@ public class DefaultMailService implements MailService { throw new IncorrectParameterException("Failed to date mail configuration. Settings not found!"); } } - + private JavaMailSenderImpl createMailSender(JsonNode jsonConfig) { JavaMailSenderImpl mailSender = new JavaMailSenderImpl(); mailSender.setHost(jsonConfig.get("smtpHost").asText()); @@ -99,7 +101,7 @@ public class DefaultMailService implements MailService { javaMailProperties.put(MAIL_PROP + protocol + ".starttls.enable", jsonConfig.has("enableTls") ? jsonConfig.get("enableTls").asText() : "false"); return javaMailProperties; } - + private int parsePort(String strPort) { try { return Integer.valueOf(strPort); @@ -112,86 +114,102 @@ public class DefaultMailService implements MailService { public void sendEmail(String email, String subject, String message) throws ThingsboardException { sendMail(mailSender, mailFrom, email, subject, message); } - + @Override public void sendTestMail(JsonNode jsonConfig, String email) throws ThingsboardException { JavaMailSenderImpl testMailSender = createMailSender(jsonConfig); String mailFrom = jsonConfig.get("mailFrom").asText(); String subject = messages.getMessage("test.message.subject", null, Locale.US); - + Map model = new HashMap(); model.put(TARGET_EMAIL, email); - + String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine, "test.vm", UTF_8, model); - - sendMail(testMailSender, mailFrom, email, subject, message); + + sendMail(testMailSender, mailFrom, email, subject, message); } @Override public void sendActivationEmail(String activationLink, String email) throws ThingsboardException { - + String subject = messages.getMessage("activation.subject", null, Locale.US); - + Map model = new HashMap(); model.put("activationLink", activationLink); model.put(TARGET_EMAIL, email); - + String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine, "activation.vm", UTF_8, model); - - sendMail(mailSender, mailFrom, email, subject, message); + + sendMail(mailSender, mailFrom, email, subject, message); } - + @Override public void sendAccountActivatedEmail(String loginLink, String email) throws ThingsboardException { - + String subject = messages.getMessage("account.activated.subject", null, Locale.US); - + Map model = new HashMap(); model.put("loginLink", loginLink); model.put(TARGET_EMAIL, email); - + String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine, "account.activated.vm", UTF_8, model); - - sendMail(mailSender, mailFrom, email, subject, message); + + sendMail(mailSender, mailFrom, email, subject, message); } @Override public void sendResetPasswordEmail(String passwordResetLink, String email) throws ThingsboardException { - + String subject = messages.getMessage("reset.password.subject", null, Locale.US); - + Map model = new HashMap(); model.put("passwordResetLink", passwordResetLink); model.put(TARGET_EMAIL, email); - + String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine, "reset.password.vm", UTF_8, model); - - sendMail(mailSender, mailFrom, email, subject, message); + + sendMail(mailSender, mailFrom, email, subject, message); } - + @Override public void sendPasswordWasResetEmail(String loginLink, String email) throws ThingsboardException { - + String subject = messages.getMessage("password.was.reset.subject", null, Locale.US); - + Map model = new HashMap(); model.put("loginLink", loginLink); model.put(TARGET_EMAIL, email); - + String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine, "password.was.reset.vm", UTF_8, model); - - sendMail(mailSender, mailFrom, email, subject, message); + + sendMail(mailSender, mailFrom, email, subject, message); } + @Override + public void send(String from, String to, String cc, String bcc, String subject, String body) throws MessagingException { + MimeMessage mailMsg = mailSender.createMimeMessage(); + MimeMessageHelper helper = new MimeMessageHelper(mailMsg, "UTF-8"); + helper.setFrom(StringUtils.isBlank(from) ? mailFrom : from); + helper.setTo(to.split("\\s*,\\s*")); + if (!StringUtils.isBlank(cc)) { + helper.setCc(cc.split("\\s*,\\s*")); + } + if (!StringUtils.isBlank(bcc)) { + helper.setBcc(bcc.split("\\s*,\\s*")); + } + helper.setSubject(subject); + helper.setText(body); + mailSender.send(helper.getMimeMessage()); + } - private void sendMail(JavaMailSenderImpl mailSender, - String mailFrom, String email, - String subject, String message) throws ThingsboardException { + private void sendMail(JavaMailSenderImpl mailSender, + String mailFrom, String email, + String subject, String message) throws ThingsboardException { try { MimeMessage mimeMsg = mailSender.createMimeMessage(); MimeMessageHelper helper = new MimeMessageHelper(mimeMsg, UTF_8); @@ -208,7 +226,7 @@ public class DefaultMailService implements MailService { protected ThingsboardException handleException(Exception exception) { String message; if (exception instanceof NestedRuntimeException) { - message = ((NestedRuntimeException)exception).getMostSpecificCause().getMessage(); + message = ((NestedRuntimeException) exception).getMostSpecificCause().getMessage(); } else { message = exception.getMessage(); } diff --git a/application/src/main/java/org/thingsboard/server/service/mail/MailExecutorService.java b/application/src/main/java/org/thingsboard/server/service/mail/MailExecutorService.java new file mode 100644 index 0000000000..97c860694c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/mail/MailExecutorService.java @@ -0,0 +1,54 @@ +/** + * Copyright © 2016-2018 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.mail; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.thingsboard.rule.engine.api.ListeningExecutor; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; + +@Component +public class MailExecutorService implements ListeningExecutor { + + @Value("${actors.rule.mail_thread_pool_size}") + private int mailExecutorThreadPoolSize; + + private ListeningExecutorService service; + + @PostConstruct + public void init() { + this.service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(mailExecutorThreadPoolSize)); + } + + @PreDestroy + public void destroy() { + if (this.service != null) { + this.service.shutdown(); + } + } + + @Override + public ListenableFuture executeAsync(Callable task) { + return service.submit(task); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java index 6943940c74..c1f3688e92 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -45,7 +45,7 @@ import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.user.UserService; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; import org.thingsboard.server.service.security.model.SecurityUser; diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 4ffa99811d..b5011e2a20 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -221,6 +221,7 @@ actors: error_persist_frequency: "${ACTORS_RULE_ERROR_FREQUENCY:3000}" # Specify thread pool size for javascript executor service js_thread_pool_size: "${ACTORS_RULE_JS_THREAD_POOL_SIZE:10}" + mail_thread_pool_size: "${ACTORS_RULE_MAIL_THREAD_POOL_SIZE:10}" chain: # Errors for particular actor are persisted once per specified amount of milliseconds error_persist_frequency: "${ACTORS_RULE_CHAIN_ERROR_FREQUENCY:3000}" diff --git a/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java b/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java index ed3750d6ca..ba2bb65acd 100644 --- a/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java +++ b/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java @@ -22,7 +22,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.rule.engine.api.MailService; +import org.thingsboard.server.common.data.exception.ThingsboardException; @Profile("test") @Configuration diff --git a/application/src/test/java/org/thingsboard/server/service/script/NashornJsEngineTest.java b/application/src/test/java/org/thingsboard/server/service/script/NashornJsEngineTest.java new file mode 100644 index 0000000000..e6a48e2838 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/service/script/NashornJsEngineTest.java @@ -0,0 +1,151 @@ +/** + * Copyright © 2016-2018 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.script; + +import com.datastax.driver.core.utils.UUIDs; +import com.google.common.collect.Sets; +import org.junit.Test; +import org.thingsboard.rule.engine.api.ScriptEngine; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; + +import javax.script.ScriptException; + +import java.util.Set; + +import static org.junit.Assert.*; + +public class NashornJsEngineTest { + + private ScriptEngine scriptEngine; + + @Test + public void msgCanBeUpdated() throws ScriptException { + String function = "metadata.temp = metadata.temp * 10; return {metadata: metadata};"; + scriptEngine = new NashornJsEngine(function, "Transform"); + + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + + TbMsg actual = scriptEngine.executeUpdate(msg); + assertEquals("70", actual.getMetaData().getValue("temp")); + } + + @Test + public void newAttributesCanBeAddedInMsg() throws ScriptException { + String function = "metadata.newAttr = metadata.humidity - msg.passed; return {metadata: metadata};"; + scriptEngine = new NashornJsEngine(function, "Transform"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + + TbMsg actual = scriptEngine.executeUpdate(msg); + assertEquals("94", actual.getMetaData().getValue("newAttr")); + } + + @Test + public void payloadCanBeUpdated() throws ScriptException { + String function = "msg.passed = msg.passed * metadata.temp; msg.bigObj.newProp = 'Ukraine'; return {msg: msg};"; + scriptEngine = new NashornJsEngine(function, "Transform"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\":\"Vit\",\"passed\": 5,\"bigObj\":{\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + + TbMsg actual = scriptEngine.executeUpdate(msg); + + String expectedJson = "{\"name\":\"Vit\",\"passed\":35,\"bigObj\":{\"prop\":42,\"newProp\":\"Ukraine\"}}"; + assertEquals(expectedJson, actual.getData()); + } + + @Test + public void metadataAccessibleForFilter() throws ScriptException { + String function = "return metadata.humidity < 15;"; + scriptEngine = new NashornJsEngine(function, "Filter"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + assertFalse(scriptEngine.executeFilter(msg)); + } + + @Test + public void dataAccessibleForFilter() throws ScriptException { + String function = "return msg.passed < 15 && msg.name === 'Vit' && metadata.temp == 7 && msg.bigObj.prop == 42;"; + scriptEngine = new NashornJsEngine(function, "Filter"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "7"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + assertTrue(scriptEngine.executeFilter(msg)); + } + + @Test + public void dataAccessibleForSwitch() throws ScriptException { + String jsCode = "function nextRelation(metadata, msg) {\n" + + " if(msg.passed == 5 && metadata.temp == 10)\n" + + " return 'one'\n" + + " else\n" + + " return 'two';\n" + + "};\n" + + "\n" + + "return nextRelation(metadata, msg);"; + scriptEngine = new NashornJsEngine(jsCode, "Switch"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + Set actual = scriptEngine.executeSwitch(msg); + assertEquals(Sets.newHashSet("one"), actual); + } + + @Test + public void multipleRelationsReturnedFromSwitch() throws ScriptException { + String jsCode = "function nextRelation(metadata, msg) {\n" + + " if(msg.passed == 5 && metadata.temp == 10)\n" + + " return ['three', 'one']\n" + + " else\n" + + " return 'two';\n" + + "};\n" + + "\n" + + "return nextRelation(metadata, msg);"; + scriptEngine = new NashornJsEngine(jsCode, "Switch"); + TbMsgMetaData metaData = new TbMsgMetaData(); + metaData.putValue("temp", "10"); + metaData.putValue("humidity", "99"); + String rawJson = "{\"name\": \"Vit\", \"passed\": 5, \"bigObj\": {\"prop\":42}}"; + + TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", null, metaData, rawJson); + Set actual = scriptEngine.executeSwitch(msg); + assertEquals(Sets.newHashSet("one", "three"), actual); + } + +} \ No newline at end of file diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java index 7b016f540e..15c52dc49c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.common.data; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import org.thingsboard.server.common.data.id.CustomerId; @@ -139,14 +140,17 @@ public class User extends SearchTextBasedWithAdditionalInfo implements H return builder.toString(); } + @JsonIgnore public boolean isSystemAdmin() { return tenantId == null || EntityId.NULL_UUID.equals(tenantId.getId()); } + @JsonIgnore public boolean isTenantAdmin() { return !isSystemAdmin() && (customerId == null || EntityId.NULL_UUID.equals(customerId.getId())); } + @JsonIgnore public boolean isCustomerUser() { return !isSystemAdmin() && !isTenantAdmin(); } diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java similarity index 95% rename from application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java rename to common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java index e78d4f208a..5b7cfb9864 100644 --- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.exception; +package org.thingsboard.server.common.data.exception; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java similarity index 96% rename from application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java rename to common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java index fcbd65eb27..fe4bd502e0 100644 --- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.exception; +package org.thingsboard.server.common.data.exception; public class ThingsboardException extends Exception { diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java index ce13e23e17..4b7314c233 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java @@ -45,6 +45,10 @@ public final class TbMsgMetaData implements Serializable { data.put(key, value); } + public Map values() { + return new HashMap<>(data); + } + public TbMsgMetaData copy() { return new TbMsgMetaData(new ConcurrentHashMap<>(data)); } diff --git a/application/src/main/java/org/thingsboard/server/service/mail/MailService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/MailService.java similarity index 80% rename from application/src/main/java/org/thingsboard/server/service/mail/MailService.java rename to rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/MailService.java index b87da4c106..02ce780293 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/MailService.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/MailService.java @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.service.mail; +package org.thingsboard.rule.engine.api; -import org.thingsboard.server.exception.ThingsboardException; +import org.thingsboard.server.common.data.exception.ThingsboardException; import com.fasterxml.jackson.databind.JsonNode; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + public interface MailService { void updateMailConfiguration(); @@ -34,5 +37,6 @@ public interface MailService { void sendResetPasswordEmail(String passwordResetLink, String email) throws ThingsboardException; void sendPasswordWasResetEmail(String loginLink, String email) throws ThingsboardException; - + + void send(String from, String to, String cc, String bcc, String subject, String body) throws MessagingException; } diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 258b173bb5..fcc9b5c03c 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -86,6 +86,10 @@ public interface TbContext { ListeningExecutor getJsExecutor(); + ListeningExecutor getMailExecutor(); + + MailService getMailService(); + ScriptEngine createJsScriptEngine(String script, String functionName, String... argNames); } diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml index 3deea9b180..419b5f6ef3 100644 --- a/rule-engine/rule-engine-components/pom.xml +++ b/rule-engine/rule-engine-components/pom.xml @@ -71,6 +71,16 @@ com.google.guava guava + + org.apache.velocity + velocity + provided + + + org.apache.velocity + velocity-tools + provided + junit junit diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/EmailPojo.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/EmailPojo.java new file mode 100644 index 0000000000..35eaa3b14b --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/EmailPojo.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2018 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.rule.engine.mail; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +class EmailPojo { + + private final String from; + private final String to; + private final String cc; + private final String bcc; + private final String subject; + private final String body; + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/RuleVelocityUtils.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/RuleVelocityUtils.java new file mode 100644 index 0000000000..7413cadd48 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/RuleVelocityUtils.java @@ -0,0 +1,68 @@ +/** + * Copyright © 2016-2018 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.rule.engine.mail; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.runtime.RuntimeServices; +import org.apache.velocity.runtime.RuntimeSingleton; +import org.apache.velocity.runtime.parser.ParseException; +import org.apache.velocity.runtime.parser.node.SimpleNode; +import org.thingsboard.server.common.msg.TbMsg; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Map; + +import static org.thingsboard.server.common.msg.TbMsgDataType.JSON; + +public class RuleVelocityUtils { + + public static VelocityContext createContext(TbMsg msg) throws IOException { + VelocityContext context = new VelocityContext(); + context.put("originator", msg.getOriginator()); + context.put("type", msg.getType()); + context.put("metadata", msg.getMetaData().values()); + if (msg.getDataType() == JSON) { + Map map = new ObjectMapper().readValue(msg.getData(), Map.class); + context.put("msg", map); + } else { + context.put("msg", msg.getData()); + } + return context; + } + + public static String merge(Template template, VelocityContext context) { + StringWriter writer = new StringWriter(); + template.merge(context, writer); + return writer.toString(); + } + + public static Template create(String source, String templateName) throws ParseException { + RuntimeServices runtimeServices = RuntimeSingleton.getRuntimeServices(); + StringReader reader = new StringReader(source); + SimpleNode node = runtimeServices.parse(reader, templateName); + Template template = new Template(); + template.setRuntimeServices(runtimeServices); + template.setData(node); + template.initDocument(); + return template; + } + + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java new file mode 100644 index 0000000000..a35e694bde --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java @@ -0,0 +1,114 @@ +/** + * Copyright © 2016-2018 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.rule.engine.mail; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.runtime.parser.ParseException; +import org.springframework.util.StringUtils; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.*; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; + +import java.io.IOException; +import java.util.Optional; + +import static org.thingsboard.rule.engine.mail.TbSendEmailNode.SEND_EMAIL_TYPE; + +@Slf4j +@RuleNode( + type = ComponentType.TRANSFORMATION, + name = "to email", + configClazz = TbMsgToEmailNodeConfiguration.class, + nodeDescription = "Change Message Originator To Tenant/Customer/Related Entity", + nodeDetails = "Related Entity found using configured relation direction and Relation Type. " + + "If multiple Related Entities are found, only first Entity is used as new Originator, other entities are discarded. ") +public class TbMsgToEmailNode implements TbNode { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + private TbMsgToEmailNodeConfiguration config; + + private Optional