Merge branch 'master' of github.com:thingsboard/thingsboard

application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.common.data.mail.MailOauth2Provider.OFFICE_365;
 
@@ -46,7 +47,9 @@ public class RefreshTokenExpCheckService {
     public static final int AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS = 90;
     private final AdminSettingsService adminSettingsService;
 
-    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${mail.oauth2.refreshTokenCheckingInterval})}", fixedDelayString = "${mail.oauth2.refreshTokenCheckingInterval}")
+    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${mail.oauth2.refreshTokenCheckingInterval})}",
+            fixedDelayString = "${mail.oauth2.refreshTokenCheckingInterval}",
+            timeUnit = TimeUnit.SECONDS)
     public void check() throws IOException {
         AdminSettings settings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (settings != null && settings.getJsonValue().has("enableOauth2") && settings.getJsonValue().get("enableOauth2").asBoolean()) {
@@ -65,8 +68,8 @@ public class RefreshTokenExpCheckService {
                             new GenericUrl(tokenUri), refreshToken)
                             .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
                             .execute();
-                    ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+                    ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
-                    ((ObjectNode)jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
+                    ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
                     adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
                 }
             }

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java

@@ -146,7 +146,7 @@ public class LwM2MClientSerDes {
         if (multiInstances) {
             Map<Integer, Object> instances = new HashMap<>();
             o.get("instances").asObject().forEach(entry -> {
-                instances.put(Integer.valueOf(entry.getName()), parseValue(type, entry.getValue()));
+                instances.put(Integer.valueOf(entry.getName()), parseValue(type, entry.getValue().asObject().get("value")));
             });
             return LwM2mMultipleResource.newResource(id, instances, type);
         } else {

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java

@@ -480,7 +480,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             CountDownLatch latch = new CountDownLatch(targetIds.size());
             targetIds.forEach(versionedId -> sendReadRequest(lwM2MClient, versionedId,
                     new TbLwM2MLatchCallback<>(latch, new TbLwM2MReadCallback(this, logService, lwM2MClient, versionedId))));
-            latch.await();
+            latch.await(config.getTimeout(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Read requests!", lwM2MClient.getEndpoint(), e);
         } catch (Exception e) {
@@ -498,7 +498,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             targetIds.forEach(targetId -> sendObserveRequest(lwM2MClient, targetId,
                     new TbLwM2MLatchCallback<>(latch, new TbLwM2MObserveCallback(this, logService, lwM2MClient, targetId))));
 
-            latch.await();
+            latch.await(config.getTimeout(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Observe requests!", lwM2MClient.getEndpoint(), e);
         } catch (Exception e) {

common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java

@@ -0,0 +1,151 @@
+/**
+ * Copyright © 2016-2024 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.transport.lwm2m.server.store.util;
+
+import org.eclipse.leshan.core.link.Link;
+import org.eclipse.leshan.core.node.LwM2mMultipleResource;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.node.LwM2mSingleResource;
+import org.eclipse.leshan.core.request.Identity;
+import org.eclipse.leshan.core.request.WriteRequest;
+import org.eclipse.leshan.server.registration.Registration;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.transport.TransportResourceCache;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
+import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
+
+import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class LwM2MClientSerDesTest {
+
+    @Test
+    public void serializeDeserialize() throws Exception {
+        LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
+
+        TransportDeviceInfo tdi = new TransportDeviceInfo();
+        tdi.setPowerMode(PowerMode.PSM);
+        tdi.setPsmActivityTimer(10000L);
+        tdi.setPagingTransmissionWindow(2000L);
+        tdi.setEdrxCycle(3000L);
+        tdi.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
+        tdi.setCustomerId(new CustomerId(UUID.randomUUID()));
+        tdi.setDeviceId(new DeviceId(UUID.randomUUID()));
+        tdi.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
+        tdi.setDeviceName("testDevice");
+        tdi.setDeviceType("testType");
+        ValidateDeviceCredentialsResponse credentialsResponse = ValidateDeviceCredentialsResponse.builder()
+                .deviceInfo(tdi)
+                .build();
+
+        client.init(credentialsResponse, UUID.randomUUID());
+
+        Registration registration =
+                new Registration.Builder("test", "testEndpoint", Identity
+                        .unsecure(new InetSocketAddress(1000)))
+                        .supportedContentFormats()
+                        .supportedObjects(Map.of(15, "1.0", 17, "1.0"))
+                        .objectLinks(new Link[]{new Link("/")})
+                        .build();
+
+        client.setRegistration(registration);
+        client.setState(LwM2MClientState.REGISTERED);
+        client.getSharedAttributes().put("key1", TransportProtos.TsKvProto.newBuilder().setTs(0).setKv(TransportProtos.KeyValueProto.newBuilder().setStringV("test").build()).build());
+        client.getSharedAttributes().put("key2", TransportProtos.TsKvProto.newBuilder().setTs(1).setKv(TransportProtos.KeyValueProto.newBuilder().setDoubleV(1.02).build()).build());
+
+        TransportResourceCache resourceCache = mock(TransportResourceCache.class);
+        LwM2mTransportContext context = mock(LwM2mTransportContext.class);
+        LwM2mClientContext clientContext = mock(LwM2mClientContext.class);
+
+        var provider = new LwM2mVersionedModelProvider(clientContext, new LwM2mTransportServerHelper(context), context);
+
+        TbResource resource15 = new TbResource();
+        resource15.setData(Files.readAllBytes(Path.of(this.getClass().getClassLoader().getResource("15.xml").toURI())));
+        TbResource resource17 = new TbResource();
+        resource17.setData(Files.readAllBytes(Path.of(this.getClass().getClassLoader().getResource("17.xml").toURI())));
+
+        when(resourceCache.get(any(), any(), eq("15_1.0"))).thenReturn(Optional.of(resource15));
+        when(resourceCache.get(any(), any(), eq("17_1.0"))).thenReturn(Optional.of(resource17));
+        when(context.getTransportResourceCache()).thenReturn(resourceCache);
+        when(clientContext.getClientByEndpoint(any())).thenReturn(client);
+
+        LwM2mResource singleResource = LwM2mSingleResource.newStringResource(15, "testValue");
+        LwM2mResource multipleResource = LwM2mMultipleResource.newStringResource(17, Map.of(0, "testValue", 1, "testValue"));
+        client.saveResourceValue("/15_1.0/0/0", singleResource, provider, WriteRequest.Mode.UPDATE);
+        client.saveResourceValue("/17_1.0/0/0", multipleResource, provider, WriteRequest.Mode.UPDATE);
+
+        byte[] bytes = LwM2MClientSerDes.serialize(client);
+        Assert.assertNotNull(bytes);
+
+        LwM2mClient desClient = LwM2MClientSerDes.deserialize(bytes);
+
+        assertEquals(client.getNodeId(), desClient.getNodeId());
+        assertEquals(client.getEndpoint(), desClient.getEndpoint());
+        assertEquals(client.getSharedAttributes(), desClient.getSharedAttributes());
+        assertEquals(client.getKeyTsLatestMap(), desClient.getKeyTsLatestMap());
+        assertEquals(client.getTenantId(), desClient.getTenantId());
+        assertEquals(client.getProfileId(), desClient.getProfileId());
+        assertEquals(client.getDeviceId(), desClient.getDeviceId());
+        assertEquals(client.getState(), desClient.getState());
+        assertEquals(client.getSession(), desClient.getSession());
+        assertEquals(client.getPowerMode(), desClient.getPowerMode());
+        assertEquals(client.getPsmActivityTimer(), desClient.getPsmActivityTimer());
+        assertEquals(client.getPagingTransmissionWindow(), desClient.getPagingTransmissionWindow());
+        assertEquals(client.getEdrxCycle(), desClient.getEdrxCycle());
+        assertEquals(client.getRegistration(), desClient.getRegistration());
+        assertEquals(client.isAsleep(), desClient.isAsleep());
+        assertEquals(client.getLastUplinkTime(), desClient.getLastUplinkTime());
+        assertEquals(client.getSleepTask(), desClient.getSleepTask());
+        assertEquals(client.getClientSupportContentFormats(), desClient.getClientSupportContentFormats());
+        assertEquals(client.getDefaultContentFormat(), desClient.getDefaultContentFormat());
+        assertEquals(client.getRetryAttempts().get(), desClient.getRetryAttempts().get());
+        assertEquals(client.getLastSentRpcId(), desClient.getLastSentRpcId());
+
+        Map<String, ResourceValue> expectedResources = client.getResources();
+        Map<String, ResourceValue> actualResources = desClient.getResources();
+        assertNotNull(actualResources);
+        assertEquals(expectedResources.size(), actualResources.size());
+        expectedResources.forEach((key, value) -> assertEquals(value.toString(), actualResources.get(key).toString()));
+    }
+
+}

common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java

@@ -1,101 +0,0 @@
-/**
- * Copyright © 2016-2024 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.transport.lwm2m.server.store.util;
-
-import org.eclipse.leshan.core.link.Link;
-import org.eclipse.leshan.core.request.Identity;
-import org.eclipse.leshan.server.registration.Registration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.thingsboard.server.common.data.device.data.PowerMode;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
-import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState;
-import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
-
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-public class LwM2MClientSerDesTest {
-
-    @Test
-    public void serializeDeserialize() {
-        LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
-
-        TransportDeviceInfo tdi = new TransportDeviceInfo();
-        tdi.setPowerMode(PowerMode.PSM);
-        tdi.setPsmActivityTimer(10000L);
-        tdi.setPagingTransmissionWindow(2000L);
-        tdi.setEdrxCycle(3000L);
-        tdi.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
-        tdi.setCustomerId(new CustomerId(UUID.randomUUID()));
-        tdi.setDeviceId(new DeviceId(UUID.randomUUID()));
-        tdi.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
-        tdi.setDeviceName("testDevice");
-        tdi.setDeviceType("testType");
-        ValidateDeviceCredentialsResponse credentialsResponse = ValidateDeviceCredentialsResponse.builder()
-                .deviceInfo(tdi)
-                .build();
-
-        client.init(credentialsResponse, UUID.randomUUID());
-
-        Registration registration =
-                new Registration.Builder("test", "testEndpoint", Identity
-                        .unsecure(new InetSocketAddress(1000)))
-                        .supportedContentFormats()
-                        .objectLinks(new Link[]{new Link("/")})
-                        .build();
-
-        client.setRegistration(registration);
-        client.setState(LwM2MClientState.REGISTERED);
-
-        client.getSharedAttributes().put("key1", TransportProtos.TsKvProto.newBuilder().setTs(0).setKv(TransportProtos.KeyValueProto.newBuilder().setStringV("test").build()).build());
-        client.getSharedAttributes().put("key2", TransportProtos.TsKvProto.newBuilder().setTs(1).setKv(TransportProtos.KeyValueProto.newBuilder().setDoubleV(1.02).build()).build());
-
-        byte[] bytes = LwM2MClientSerDes.serialize(client);
-        Assert.assertNotNull(bytes);
-
-        LwM2mClient desClient = LwM2MClientSerDes.deserialize(bytes);
-
-        Assert.assertEquals(client.getNodeId(), desClient.getNodeId());
-        Assert.assertEquals(client.getEndpoint(), desClient.getEndpoint());
-        Assert.assertEquals(client.getResources(), desClient.getResources());
-        Assert.assertEquals(client.getSharedAttributes(), desClient.getSharedAttributes());
-        Assert.assertEquals(client.getKeyTsLatestMap(), desClient.getKeyTsLatestMap());
-        Assert.assertEquals(client.getTenantId(), desClient.getTenantId());
-        Assert.assertEquals(client.getProfileId(), desClient.getProfileId());
-        Assert.assertEquals(client.getDeviceId(), desClient.getDeviceId());
-        Assert.assertEquals(client.getState(), desClient.getState());
-        Assert.assertEquals(client.getSession(), desClient.getSession());
-        Assert.assertEquals(client.getPowerMode(), desClient.getPowerMode());
-        Assert.assertEquals(client.getPsmActivityTimer(), desClient.getPsmActivityTimer());
-        Assert.assertEquals(client.getPagingTransmissionWindow(), desClient.getPagingTransmissionWindow());
-        Assert.assertEquals(client.getEdrxCycle(), desClient.getEdrxCycle());
-        Assert.assertEquals(client.getRegistration(), desClient.getRegistration());
-        Assert.assertEquals(client.isAsleep(), desClient.isAsleep());
-        Assert.assertEquals(client.getLastUplinkTime(), desClient.getLastUplinkTime());
-        Assert.assertEquals(client.getSleepTask(), desClient.getSleepTask());
-        Assert.assertEquals(client.getClientSupportContentFormats(), desClient.getClientSupportContentFormats());
-        Assert.assertEquals(client.getDefaultContentFormat(), desClient.getDefaultContentFormat());
-        Assert.assertEquals(client.getRetryAttempts().get(), desClient.getRetryAttempts().get());
-        Assert.assertEquals(client.getLastSentRpcId(), desClient.getLastSentRpcId());
-    }
-}

common/transport/lwm2m/src/test/resources/15.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LWM2M>
+    <Object ObjectType="MODefinition">
+        <Name>Test 15</Name>
+        <Description1></Description1>
+        <ObjectID>15</ObjectID>
+        <ObjectURN>urn:oma:lwm2m:oma:15:1.0</ObjectURN>
+        <LWM2MVersion>1.0</LWM2MVersion>
+        <ObjectVersion>1.0</ObjectVersion>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Resources>
+            <Item ID="0">
+                <Name>Test</Name>
+                <Operations>R</Operations>
+                <MultipleInstances>Single</MultipleInstances>
+                <Mandatory>Mandatory</Mandatory>
+                <Type>String</Type>
+                <RangeEnumeration></RangeEnumeration>
+                <Units></Units>
+                <Description></Description>
+            </Item>
+        </Resources>
+        <Description2></Description2>
+    </Object>
+</LWM2M>

common/transport/lwm2m/src/test/resources/17.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LWM2M>
+    <Object ObjectType="MODefinition">
+        <Name>Test 17</Name>
+        <Description1></Description1>
+        <ObjectID>17</ObjectID>
+        <ObjectURN>urn:oma:lwm2m:oma:17:1.0</ObjectURN>
+        <LWM2MVersion>1.0</LWM2MVersion>
+        <ObjectVersion>1.0</ObjectVersion>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Resources>
+            <Item ID="0">
+                <Name>Test</Name>
+                <Operations>R</Operations>
+                <MultipleInstances>Multiple</MultipleInstances>
+                <Mandatory>Optional</Mandatory>
+                <Type>String</Type>
+                <RangeEnumeration></RangeEnumeration>
+                <Units></Units>
+                <Description></Description>
+            </Item>
+        </Resources>
+        <Description2></Description2>
+    </Object>
+</LWM2M>

msa/js-executor/docker/Dockerfile

@@ -35,7 +35,7 @@ COPY src/server.js ./
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-js-executor.sh /usr/bin \
     && chown -R node:node ${pkg.installFolder} \
-    && yarn install --production && yarn cache clean --all
+    && yarn install --production --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network && yarn cache clean --all
 
 USER node
 

msa/js-executor/pom.xml

@@ -81,7 +81,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                     <execution>

msa/web-ui/docker/Dockerfile

@@ -34,7 +34,7 @@ COPY src/server.js ./
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-web-ui.sh /usr/bin \
     && chown -R node:node ${pkg.installFolder} \
-    && yarn install --production && yarn cache clean --all
+    && yarn install --production --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network && yarn cache clean --all
 
 USER node
 

msa/web-ui/pom.xml

@@ -90,7 +90,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                     <execution>

ui-ngx/pom.xml

@@ -66,7 +66,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                 </executions>