downlink tasks order changed: first save frame, then send it. No avoi…

…d recieving ack for the frames that not saved yet' (#584)
brocaar · Apr 3, 2023 · 2a287fa · 2a287fa
1 parent 370565a
commit 2a287fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/internal/downlink/ack/ack.go b/internal/downlink/ack/ack.go
@@ -50,8 +50,8 @@ var handleDownlinkTXAckTasks = []func(*ackContext) error{
 		),
 
 		// Backwards compatibility.
-		sendDownlinkFrame,
 		saveDownlinkFrames,
+		sendDownlinkFrame,
 	),
 	onNoError(
 		// Start a transaction so that we can lock the device record. Without

diff --git a/internal/downlink/data/data.go b/internal/downlink/data/data.go
@@ -124,14 +124,14 @@ var responseTasks = []func(*dataContext) error{
 	setMACCommandsSet,
 	stopOnNothingToSend,
 	setPHYPayloads,
+	saveDownlinkFrame,
+	saveDeviceSession,
 	isRoaming(false,
 		sendDownlinkFrame,
 	),
 	isRoaming(true,
 		sendDownlinkFramePassiveRoaming,
 	),
-	saveDeviceSession,
-	saveDownlinkFrame,
 	isRoaming(true,
 		handleRoamingTxAck,
 	),
@@ -160,9 +160,9 @@ var scheduleNextQueueItemTasks = []func(*dataContext) error{
 	getNextDeviceQueueItem,
 	stopOnNothingToSend,
 	setPHYPayloads,
-	sendDownlinkFrame,
 	saveDeviceSession,
 	saveDownlinkFrame,
+	sendDownlinkFrame,
 	setDeviceQueueItemRetryAfter,
 }
 

diff --git a/internal/downlink/multicast/multicast.go b/internal/downlink/multicast/multicast.go
@@ -40,8 +40,8 @@ var multicastTasks = []func(*multicastContext) error{
 	validatePayloadSize,
 	setTXInfo,
 	setPHYPayload,
-	sendDownlinkData,
 	saveDownlinkFrame,
+	sendDownlinkData,
 }
 
 var (

diff --git a/internal/downlink/proprietary/proprietary.go b/internal/downlink/proprietary/proprietary.go
@@ -20,8 +20,8 @@ import (
 const defaultCodeRate = "4/5"
 
 var tasks = []func(*proprietaryContext) error{
-	sendProprietaryDown,
 	saveDownlinkFrames,
+	sendProprietaryDown,
 }
 
 type proprietaryContext struct {