LwM2M Firmware Update Delivery Method

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportUtil.java

@@ -137,6 +137,9 @@ public class LwM2mTransportUtil {
     public static final String FW_STATE_ID = "/5/0/3";
     // Update Result R
     public static final String FW_RESULT_ID = "/5/0/5";
+
+    public static final String FW_DELIVERY_METHOD = "/5/0/9";
+
     // PkgName R
     public static final String FW_NAME_ID = "/5/0/6";
     // PkgVersion R

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java

@@ -33,6 +33,7 @@ import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
+import org.thingsboard.server.transport.lwm2m.server.LwM2MFirmwareUpdateStrategy;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
 import org.thingsboard.server.transport.lwm2m.server.UpdateStateFw;
@@ -180,6 +181,12 @@ public class DefaultLwM2MOtaUpdateService implements LwM2MOtaUpdateService {
         }
     }
 
+    @Override
+    public void onCurrentFirmwareDeliveryMethodUpdate(LwM2mClient client, Long value) {
+        LwM2MClientOtaInfo fwInfo = getOrInitFwInfo(client);
+        fwInfo.setDeliveryMethod(value.intValue());
+    }
+
     @Override
     public void onTargetSoftwareUpdate(LwM2mClient client, String newSoftwareTitle, String newSoftwareVersion) {
 
@@ -211,7 +218,12 @@ public class DefaultLwM2MOtaUpdateService implements LwM2MOtaUpdateService {
                         if (TransportProtos.ResponseStatus.SUCCESS.equals(response.getResponseStatus())
                                 && response.getType().equals(OtaPackageType.FIRMWARE.name())) {
                             UUID otaPackageId = new UUID(response.getOtaPackageIdMSB(), response.getOtaPackageIdLSB());
-                            var strategy = fwInfo.getStrategy();
+                            LwM2MFirmwareUpdateStrategy strategy;
+                            if (fwInfo.getDeliveryMethod() == null || fwInfo.getDeliveryMethod() == 2) {
+                                strategy = fwInfo.getStrategy();
+                            } else {
+                                strategy = fwInfo.getDeliveryMethod() == 0 ? LwM2MFirmwareUpdateStrategy.OBJ_5_TEMP_URL : LwM2MFirmwareUpdateStrategy.OBJ_5_BINARY;
+                            }
                             switch (strategy) {
                                 case OBJ_5_BINARY:
                                     byte[] firmwareChunk = otaPackageDataCache.get(otaPackageId.toString(), 0, 0);

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java

@@ -41,6 +41,7 @@ public class LwM2MClientOtaInfo {
     private boolean currentFetchFailure;
     private String currentName;
     private String currentVersion;
+    private Integer deliveryMethod;
 
     //TODO: use value from device if applicable;
     private LwM2MFirmwareUpdateStrategy strategy;
@@ -96,4 +97,5 @@ public class LwM2MClientOtaInfo {
     private static String getPackageId(String name, String version) {
         return (StringUtils.isNotEmpty(name) ? name : "") + (StringUtils.isNotEmpty(version) ? version : "");
     }
+
 }

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MOtaUpdateService.java

@@ -34,4 +34,6 @@ public interface LwM2MOtaUpdateService {
     void onCurrentFirmwareStateUpdate(LwM2mClient client, Long state);
 
     void onCurrentFirmwareResultUpdate(LwM2mClient client, Long result);
+
+    void onCurrentFirmwareDeliveryMethodUpdate(LwM2mClient lwM2MClient, Long value);
 }

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

@@ -109,6 +109,7 @@ import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.FAIL
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_3_VER_ID;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_5_ID;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_5_VER_ID;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_DELIVERY_METHOD;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_NAME_ID;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_RESULT_ID;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_STATE_ID;
@@ -571,6 +572,8 @@ public class DefaultLwM2MUplinkMsgHandler implements LwM2mUplinkMsgHandler {
                 otaService.onCurrentFirmwareStateUpdate(lwM2MClient, (Long) lwM2mResource.getValue());
             } else if (path.equals(convertObjectIdToVersionedId(FW_RESULT_ID, registration))) {
                 otaService.onCurrentFirmwareResultUpdate(lwM2MClient, (Long) lwM2mResource.getValue());
+            } else if (path.equals(convertObjectIdToVersionedId(FW_DELIVERY_METHOD, registration))) {
+                otaService.onCurrentFirmwareDeliveryMethodUpdate(lwM2MClient, (Long) lwM2mResource.getValue());
             }
             this.updateAttrTelemetry(registration, Collections.singleton(path));
         } else {