refactor: 脚本引擎模块调整

TCP模块调整到transport-api
用户脚本测试

@@ -98,10 +98,6 @@
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
 
 
-        <dependency>
-            <groupId>org.javadelight</groupId>
-            <artifactId>delight-nashorn-sandbox</artifactId>
-        </dependency>
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

@@ -15,8 +15,6 @@
  */
  */
 package org.thingsboard.server.transport.tcp.adaptors;
 package org.thingsboard.server.transport.tcp.adaptors;
 
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -38,8 +36,8 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.tcp.script.JsInvokeService;
-import org.thingsboard.server.transport.tcp.script.JsScriptType;
+import org.thingsboard.server.common.yunteng.script.YtScriptInvokeService;
+import org.thingsboard.server.common.yunteng.script.YtScriptType;
 import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
 import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
 
 
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
@@ -59,7 +57,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 
 
     protected static final Charset UTF8 = StandardCharsets.UTF_8;
     protected static final Charset UTF8 = StandardCharsets.UTF_8;
     @Autowired
     @Autowired
-    private JsInvokeService jsEngine;
+    private YtScriptInvokeService jsEngine;
     private static final JsonParser parser = new JsonParser();
     private static final JsonParser parser = new JsonParser();
     @Override
     @Override
     public TransportProtos.PostTelemetryMsg convertToPostTelemetry(DeviceSessionCtx ctx, String inbound) throws AdaptorException {
     public TransportProtos.PostTelemetryMsg convertToPostTelemetry(DeviceSessionCtx ctx, String inbound) throws AdaptorException {
@@ -78,7 +76,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 
 
     @Override
     @Override
     public UUID getJsScriptEngineFunctionId(String scriptBody, String... argNames) throws ExecutionException, InterruptedException {
     public UUID getJsScriptEngineFunctionId(String scriptBody, String... argNames) throws ExecutionException, InterruptedException {
-        return jsEngine.eval(JsScriptType.TCP_TRANSPORT_SCRIPT, scriptBody, argNames).get();
+        return jsEngine.eval(YtScriptType.TCP_TRANSPORT_SCRIPT, scriptBody, argNames).get();
     }
     }
 
 
     @Override
     @Override

@@ -137,6 +137,11 @@
             <groupId>org.bouncycastle</groupId>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         </dependency>
+
+        <dependency>
+            <groupId>org.javadelight</groupId>
+            <artifactId>delight-nashorn-sandbox</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
@@ -26,6 +26,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.server.common.yunteng.script.AbstractYtScriptInvokeService;
+import org.thingsboard.server.common.yunteng.script.YtScriptExecutorService;
+import org.thingsboard.server.common.yunteng.script.YtScriptStatCallback;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
@@ -42,7 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 
 @Slf4j
 @Slf4j
-public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeService {
+public abstract class AbstractNashornYtScriptInvokeService extends AbstractYtScriptInvokeService {
 
 
     private NashornSandbox sandbox;
     private NashornSandbox sandbox;
     private ScriptEngine engine;
     private ScriptEngine engine;
@@ -53,13 +56,13 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer
     private final AtomicInteger jsEvalMsgs = new AtomicInteger(0);
     private final AtomicInteger jsEvalMsgs = new AtomicInteger(0);
     private final AtomicInteger jsFailedMsgs = new AtomicInteger(0);
     private final AtomicInteger jsFailedMsgs = new AtomicInteger(0);
     private final AtomicInteger jsTimeoutMsgs = new AtomicInteger(0);
     private final AtomicInteger jsTimeoutMsgs = new AtomicInteger(0);
-    private final FutureCallback<UUID> evalCallback = new JsStatCallback<>(jsEvalMsgs, jsTimeoutMsgs, jsFailedMsgs);
-    private final FutureCallback<Object> invokeCallback = new JsStatCallback<>(jsInvokeMsgs, jsTimeoutMsgs, jsFailedMsgs);
+    private final FutureCallback<UUID> evalCallback = new YtScriptStatCallback<>(jsEvalMsgs, jsTimeoutMsgs, jsFailedMsgs);
+    private final FutureCallback<Object> invokeCallback = new YtScriptStatCallback<>(jsInvokeMsgs, jsTimeoutMsgs, jsFailedMsgs);
 
 
     private final ReentrantLock evalLock = new ReentrantLock();
     private final ReentrantLock evalLock = new ReentrantLock();
 
 
     @Getter
     @Getter
-    private final TcpJsExecutorService jsExecutor;
+    private final YtScriptExecutorService jsExecutor;
 
 
     @Value("${js.local.max_requests_timeout:0}")
     @Value("${js.local.max_requests_timeout:0}")
     private long maxRequestsTimeout;
     private long maxRequestsTimeout;
@@ -67,7 +70,7 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer
     @Value("${js.local.stats.enabled:false}")
     @Value("${js.local.stats.enabled:false}")
     private boolean statsEnabled;
     private boolean statsEnabled;
 
 
-    public AbstractNashornJsInvokeService(TbApiUsageClient apiUsageClient, TcpJsExecutorService jsExecutor) {
+    public AbstractNashornYtScriptInvokeService(TbApiUsageClient apiUsageClient, YtScriptExecutorService jsExecutor) {
         super();
         super();
         this.jsExecutor = jsExecutor;
         this.jsExecutor = jsExecutor;
     }
     }

@@ -13,15 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.ApiUsageRecordKey;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.TenantId;
 
 
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
@@ -34,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * Created by ashvayka on 26.09.18.
  * Created by ashvayka on 26.09.18.
  */
  */
 @Slf4j
 @Slf4j
-public abstract class AbstractJsInvokeService implements JsInvokeService {
+public abstract class AbstractYtScriptInvokeService implements YtScriptInvokeService {
 
 
 
 
 
 
@@ -57,7 +54,7 @@ public abstract class AbstractJsInvokeService implements JsInvokeService {
     }
     }
 
 
     @Override
     @Override
-    public ListenableFuture<UUID> eval(JsScriptType scriptType, String scriptBody, String... argNames) {
+    public ListenableFuture<UUID> eval(YtScriptType scriptType, String scriptBody, String... argNames) {
             UUID scriptId = UUID.randomUUID();
             UUID scriptId = UUID.randomUUID();
             String functionName = "invokeInternal_" + scriptId.toString().replace('-', '_');
             String functionName = "invokeInternal_" + scriptId.toString().replace('-', '_');
             String jsScript = generateJsScript(scriptType, functionName, scriptBody, argNames);
             String jsScript = generateJsScript(scriptType, functionName, scriptBody, argNames);
@@ -112,9 +109,9 @@ public abstract class AbstractJsInvokeService implements JsInvokeService {
         disableListInfo.incrementAndGet();
         disableListInfo.incrementAndGet();
     }
     }
 
 
-    private String generateJsScript(JsScriptType scriptType, String functionName, String scriptBody, String... argNames) {
-        if (scriptType == JsScriptType.TCP_TRANSPORT_SCRIPT) {
-            return YtTcpScriptFactory.generateRuleNodeScript(functionName, scriptBody, argNames);
+    private String generateJsScript(YtScriptType scriptType, String functionName, String scriptBody, String... argNames) {
+        if (scriptType == YtScriptType.TCP_TRANSPORT_SCRIPT) {
+            return YtScriptFactory.generateRuleNodeScript(functionName, scriptBody, argNames);
 
 
         }
         }
         throw new RuntimeException("No script factory implemented for scriptType: " + scriptType);
         throw new RuntimeException("No script factory implemented for scriptType: " + scriptType);

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.yunteng.script.AbstractNashornYtScriptInvokeService;
+import org.thingsboard.server.common.yunteng.script.YtScriptExecutorService;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
@@ -27,7 +29,7 @@ import java.util.concurrent.TimeUnit;
 @ConditionalOnProperty(prefix = "js", value = "evaluator", havingValue = "local", matchIfMissing = true)
 @ConditionalOnProperty(prefix = "js", value = "evaluator", havingValue = "local", matchIfMissing = true)
 @Service
 @Service
 public class
 public class
-TcpNashornJsInvokeService extends AbstractNashornJsInvokeService {
+NashornYtScriptInvokeService extends AbstractNashornYtScriptInvokeService {
 
 
     @Value("${js.local.use_js_sandbox}")
     @Value("${js.local.use_js_sandbox}")
     private boolean useJsSandbox;
     private boolean useJsSandbox;
@@ -44,7 +46,7 @@ TcpNashornJsInvokeService extends AbstractNashornJsInvokeService {
     @Value("${js.local.max_black_list_duration_sec:60}")
     @Value("${js.local.max_black_list_duration_sec:60}")
     private int maxBlackListDurationSec;
     private int maxBlackListDurationSec;
 
 
-    public TcpNashornJsInvokeService(TbApiUsageClient apiUsageClient, TcpJsExecutorService jsExecutor) {
+    public NashornYtScriptInvokeService(TbApiUsageClient apiUsageClient, YtScriptExecutorService jsExecutor) {
         super(apiUsageClient, jsExecutor);
         super(apiUsageClient, jsExecutor);
     }
     }
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import com.google.protobuf.util.JsonFormat;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.protobuf.util.JsonFormat;
 import com.google.protobuf.util.JsonFormat;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.js.JsInvokeProtos;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
@@ -42,9 +42,9 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 @Slf4j
 @Slf4j
-@ConditionalOnExpression("'${js.evaluator:null}'=='remote' && ('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core' || '${service.type:null}'=='tb-rule-engine')")
+@ConditionalOnExpression("'${js.evaluator:null}'=='remote' && ('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core' || '${service.type:null}'=='tb-transport')")
 @Service
 @Service
-public class TcpRemoteJsInvokeService extends AbstractJsInvokeService {
+public class YtRemoteJsInvokeService extends AbstractYtScriptInvokeService {
 
 
     @Value("${queue.js.max_eval_requests_timeout}")
     @Value("${queue.js.max_eval_requests_timeout}")
     private long maxEvalRequestsTimeout;
     private long maxEvalRequestsTimeout;
@@ -70,7 +70,7 @@ public class TcpRemoteJsInvokeService extends AbstractJsInvokeService {
     private final ExecutorService callbackExecutor = Executors.newFixedThreadPool(
     private final ExecutorService callbackExecutor = Executors.newFixedThreadPool(
             Runtime.getRuntime().availableProcessors(), ThingsBoardThreadFactory.forName("js-executor-remote-callback"));
             Runtime.getRuntime().availableProcessors(), ThingsBoardThreadFactory.forName("js-executor-remote-callback"));
 
 
-    public TcpRemoteJsInvokeService(TbApiUsageClient apiUsageClient) {
+    public YtRemoteJsInvokeService(TbApiUsageClient apiUsageClient) {
         super();
         super();
     }
     }
 
 

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 
 
 @Component
 @Component
-public class TcpJsExecutorService extends AbstractListeningExecutor {
+public class YtScriptExecutorService extends AbstractListeningExecutor {
 
 
     @Value("${actors.rule.js_thread_pool_size}")
     @Value("${actors.rule.js_thread_pool_size}")
     private int jsExecutorThreadPoolSize;
     private int jsExecutorThreadPoolSize;

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
-public class YtTcpScriptFactory {
+public class YtScriptFactory {
 
 
     public static final String MSG = "msg";
     public static final String MSG = "msg";
 
 

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
  * Created by ashvayka on 25.09.18.
  * Created by ashvayka on 25.09.18.
  */
  */
-public class JsInvokeRequest {
+public class YtScriptInvokeRequest {
 
 
     private String scriptId;
     private String scriptId;
     private String scriptBody;
     private String scriptBody;

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
  * Created by ashvayka on 25.09.18.
  * Created by ashvayka on 25.09.18.
  */
  */
-public class JsInvokeResponse {
+public class YtScriptInvokeResponse {
 
 
     private String scriptId;
     private String scriptId;
     private String scriptBody;
     private String scriptBody;

@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.TenantId;
 
 
 import java.util.UUID;
 import java.util.UUID;
 
 
-public interface JsInvokeService {
+public interface YtScriptInvokeService {
 
 
-    ListenableFuture<UUID> eval(JsScriptType scriptType, String scriptBody, String... argNames);
+    ListenableFuture<UUID> eval(YtScriptType scriptType, String scriptBody, String... argNames);
 
 
     ListenableFuture<Object> invokeFunction(UUID scriptId, Object... args);
     ListenableFuture<Object> invokeFunction(UUID scriptId, Object... args);
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 @AllArgsConstructor
 @AllArgsConstructor
-public class JsStatCallback<T> implements FutureCallback<T> {
+public class YtScriptStatCallback<T> implements FutureCallback<T> {
 
 
     private final AtomicInteger jsSuccessMsgs;
     private final AtomicInteger jsSuccessMsgs;
     private final AtomicInteger jsTimeoutMsgs;
     private final AtomicInteger jsTimeoutMsgs;

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.tcp.script;
+package org.thingsboard.server.common.yunteng.script;
 
 
-public enum JsScriptType {
-    RULE_NODE_SCRIPT,
+public enum YtScriptType {
     TCP_TRANSPORT_SCRIPT
     TCP_TRANSPORT_SCRIPT
 }
 }