Merge branch '20230509' into 'master_dev'

20230509 See merge request yunteng/thingskit!193

Merge branch '20230509' into 'master_dev'
20230509 See merge request yunteng/thingskit!193
xp.Huang
2 parents 537beac6 723cf159
Showing 5 changed files with 51 additions and 12 deletions
application/src/main/java/org/thingsboard/server/utils/yunteng/RpcCommandTask.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/DeviceDTO.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
transport/mqtt/pom.xml
transport/tcp/src/main/resources/tb-tcp-transport.yml
--- a/application/src/main/java/org/thingsboard/server/utils/yunteng/RpcCommandTask.java
View file @285a79a
+++ b/application/src/main/java/org/thingsboard/server/utils/yunteng/RpcCommandTask.java
View file @285a79a
@@ -30,6 +30,7 @@ import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceTaskCenterService;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import java.time.LocalDateTime;
@@ -39,6 +40,7 @@ import java.util.*;
 @Component("rpcCommandTask")
 @RequiredArgsConstructor
 @Slf4j
+@TbCoreComponent
 public class RpcCommandTask {
   @Value("${server.rest.server_side_rpc.default_timeout:10000}")
   protected long defaultTimeout;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/DeviceDTO.java
View file @285a79a
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/DeviceDTO.java
View file @285a79a
@@ -124,7 +124,7 @@ public class DeviceDTO extends TenantDTO {
   private JsonNode customerAdditionalInfo;
   public DeviceState getDeviceState() {
-    if (lastOnlineTime == null) {
+    if (statusTime == null) {
       return DeviceState.INACTIVE;
     }
     return deviceState;
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
View file @285a79a
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
View file @285a79a
@@ -297,7 +297,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         if (DataConstants.PROVISION.equals(accessToken) || DataConstants.PROVISION.equals(accessToken)) {
             deviceSessionCtx.setProvisionOnly(true);
-            ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_ACCEPTED.name()));
+            pushDeviceMsg(ctx,CONNECTION_ACCEPTED.name());
         } else {
             TkScriptInvokeService.authScripts.forEach(id -> {
                 ListenableFuture item = context.getJsEngine().invokeFunction(id, accessToken);
@@ -347,9 +347,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     }
-    private ByteBuf createTcpConnAckMsg(String msg) {
-        return Unpooled.copiedBuffer(ByteUtils.getBytes(msg, ByteUtils.UTF_8));
-    }
+
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) {
@@ -450,7 +448,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
                 public void onSuccess(Void msg) {
                     SessionMetaData sessionMetaData = transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), TcpTransportHandler.this);
                     checkGatewaySession(sessionMetaData);
-                    ctx.writeAndFlush(createTcpConnAckMsg(authEntry.getSuccess()));
+                    pushDeviceMsg(ctx,authEntry.getSuccess());
                     deviceSessionCtx.setConnected(true);
                     log.debug("[{}] Client connected!", sessionId);
@@ -474,7 +472,8 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     private void onValidateFailed(ChannelHandlerContext ctx, MqttConnectReturnCode msg) {
         authedCounter.incrementAndGet();
         if (TkScriptInvokeService.authScripts.size() == authedCounter.intValue()) {
-            ctx.writeAndFlush(createTcpConnAckMsg(msg.name()));
+            pushDeviceMsg(ctx,msg.name());
+
             ctx.close();
         }
     }
--- a/transport/mqtt/pom.xml
View file @285a79a
+++ b/transport/mqtt/pom.xml
View file @285a79a
@@ -41,7 +41,7 @@
         <pkg.copyInstallScripts>false</pkg.copyInstallScripts>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
         <pkg.implementationTitle>ThingsBoard MQTT Transport Service</pkg.implementationTitle>
-        <pkg.mainClass>org.thingsboard.server.tcp.ThingsboardMqttTransportApplication</pkg.mainClass>
+        <pkg.mainClass>org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication</pkg.mainClass>
     </properties>
     <dependencies>
--- a/transport/tcp/src/main/resources/tb-tcp-transport.yml
View file @285a79a
+++ b/transport/tcp/src/main/resources/tb-tcp-transport.yml
View file @285a79a
@@ -28,9 +28,9 @@ server:
 # Zookeeper connection parameters. Used for service discovery.
 zk:
   # Enable/disable zookeeper discovery service.
-  enabled: "${ZOOKEEPER_ENABLED:true}"
+  enabled: "${ZOOKEEPER_ENABLED:false}"
   # Zookeeper connect string
-  url: "${ZOOKEEPER_URL:47.99.141.212:2181}"
+  url: "${ZOOKEEPER_URL:localhost:2181}"
   # Zookeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
   # Zookeeper connection timeout in milliseconds
@@ -68,7 +68,7 @@ redis:
   # db index
   db: "${REDIS_DB:0}"
   # db password
-  password: "${REDIS_PASSWORD:redis@6379}"
+  password: "${REDIS_PASSWORD:}"
   # pool config
   pool_config:
     maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
@@ -83,6 +83,42 @@ redis:
     numberTestsPerEvictionRun: "${REDIS_POOL_CONFIG_NUMBER_TESTS_PER_EVICTION_RUN:3}"
     blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
+# Actor system parameters
+actors:
+  rule:
+#    # Specify thread pool size for database request callbacks executor service
+#    db_callback_thread_pool_size: "${ACTORS_RULE_DB_CALLBACK_THREAD_POOL_SIZE:50}"
+    # Specify thread pool size for javascript executor service
+    js_thread_pool_size: "${ACTORS_RULE_JS_THREAD_POOL_SIZE:50}"
+js:
+  evaluator: "${JS_EVALUATOR:local}" # local/remote
+  # Built-in JVM JavaScript environment properties
+  local:
+    # Use Sandboxed (secured) JVM JavaScript environment
+    use_js_sandbox: "${USE_LOCAL_JS_SANDBOX:true}"
+    # Specify thread pool size for JavaScript sandbox resource monitor
+    monitor_thread_pool_size: "${LOCAL_JS_SANDBOX_MONITOR_THREAD_POOL_SIZE:4}"
+    # Maximum CPU time in milliseconds allowed for script execution
+    max_cpu_time: "${LOCAL_JS_SANDBOX_MAX_CPU_TIME:8000}"
+    # Maximum allowed JavaScript execution errors before JavaScript will be blacklisted
+    max_errors: "${LOCAL_JS_SANDBOX_MAX_ERRORS:3}"
+    # JS Eval max request timeout. 0 - no timeout
+    max_requests_timeout: "${LOCAL_JS_MAX_REQUEST_TIMEOUT:0}"
+    # Maximum time in seconds for black listed function to stay in the list.
+    max_black_list_duration_sec: "${LOCAL_JS_SANDBOX_MAX_BLACKLIST_DURATION_SEC:60}"
+    stats:
+      enabled: "${TB_JS_LOCAL_STATS_ENABLED:false}"
+      print_interval_ms: "${TB_JS_LOCAL_STATS_PRINT_INTERVAL_MS:10000}"
+  # Remote JavaScript environment properties
+  remote:
+    # Maximum allowed JavaScript execution errors before JavaScript will be blacklisted
+    max_errors: "${REMOTE_JS_SANDBOX_MAX_ERRORS:3}"
+    # Maximum time in seconds for black listed function to stay in the list.
+    max_black_list_duration_sec: "${REMOTE_JS_SANDBOX_MAX_BLACKLIST_DURATION_SEC:60}"
+    stats:
+      enabled: "${TB_JS_REMOTE_STATS_ENABLED:false}"
+      print_interval_ms: "${TB_JS_REMOTE_STATS_PRINT_INTERVAL_MS:10000}"
+
 # TCP_ server parameters
 transport:
   tcp:
@@ -163,7 +199,7 @@ transport:
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
   kafka:
-    bootstrap.servers: "${TB_KAFKA_SERVERS:47.99.141.212:9092}"
+    bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
     acks: "${TB_KAFKA_ACKS:all}"
     retries: "${TB_KAFKA_RETRIES:1}"
     batch.size: "${TB_KAFKA_BATCH_SIZE:16384}"
@@ -345,3 +381,5 @@ management:
       exposure:
         # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics).
         include: '${METRICS_ENDPOINTS_EXPOSE:info}'
+
+