jobs ack fix

client/helpers/messageHelper.go

@@ -3,8 +3,6 @@ package helpers
 import (
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 	"time"
 
 	"forge.redroom.link/yves/meowlib"
@@ -28,25 +26,29 @@ func PackMessageForServer(packedMsg *meowlib.PackedUserMessage, srvuid string) (
 }
 
 func CreateStorePackUserMessageForServer(message string, srvuid string, peer_uid string, replyToUid string, filelist []string) ([]byte, string, error) {
-	usermessage, errtxt, err := CreateAndStoreUserMessage(message, peer_uid, replyToUid, filelist)
+	usermessage, _, _, errtxt, err := CreateAndStoreUserMessage(message, peer_uid, replyToUid, filelist)
 	if err != nil {
 		return nil, errtxt, err
 	}
 	return PackMessageForServer(usermessage, srvuid)
 }
 
-func CreateAndStoreUserMessage(message string, peer_uid string, replyToUid string, filelist []string) (*meowlib.PackedUserMessage, string, error) {
+// CreateAndStoreUserMessage creates, stores and packs a user message.
+// It returns the packed message, the message DB file UUID, the SQLite row ID,
+// an error location string, and the error. The caller should set MessageDbFile
+// and MessageDbId on the SendJob from the returned dbFile and dbId values.
+func CreateAndStoreUserMessage(message string, peer_uid string, replyToUid string, filelist []string) (packedMsg *meowlib.PackedUserMessage, dbFile string, dbId int64, errTxt string, err error) {
 	peer := client.GetConfig().GetIdentity().Peers.GetFromUid(peer_uid)
 
 	// Creating User message
 	usermessage, err := peer.BuildSimpleUserMessage([]byte(message))
 	if err != nil {
-		return nil, "PrepareServerMessage : BuildSimpleUserMessage", err
+		return nil, "", 0, "PrepareServerMessage : BuildSimpleUserMessage", err
 	}
 	for _, file := range filelist {
 		err = usermessage.AddFile(file, client.GetConfig().Chunksize)
 		if err != nil {
-			return nil, "PrepareServerMessage : AddFile", err
+			return nil, "", 0, "PrepareServerMessage : AddFile", err
 		}
 	}
 	usermessage.Status.Sent = uint64(time.Now().UTC().Unix())
@@ -55,16 +57,20 @@ func CreateAndStoreUserMessage(message string, peer_uid string, replyToUid strin
 	// Store message
 	err = peer.StoreMessage(usermessage, nil)
 	if err != nil {
-		return nil, "messageBuildPostprocess : StoreMessage", err
+		return nil, "", 0, "messageBuildPostprocess : StoreMessage", err
 	}
 
 	// Prepare cyphered + packed user message
-	packedMsg, err := peer.ProcessOutboundUserMessage(usermessage)
+	packedMsg, err = peer.ProcessOutboundUserMessage(usermessage)
 	if err != nil {
-		return nil, "messageBuildPostprocess : ProcessOutboundUserMessage", err
+		return nil, "", 0, "messageBuildPostprocess : ProcessOutboundUserMessage", err
 	}
 
-	return packedMsg, "", nil
+	if peer.LastMessage != nil {
+		dbFile = peer.LastMessage.Dbfile
+		dbId = peer.LastMessage.Dbid
+	}
+	return packedMsg, dbFile, dbId, "", nil
 }
 
 func BuildAckMessage(messageUid string, srvuid string, peer_uid string, received int64, processed int64) ([]byte, string, error) {
@@ -105,10 +111,8 @@ func ReadAckMessageResponse() {
 // the message storage entry with server delivery info for each sent job, then
 // removes the job from the queue. Returns the number of messages updated.
 //
-// Callers must follow two conventions when building a SendJob:
-//   - job.Queue  = peer UID  (used to look up the peer and its DB files)
-//   - job.File   = a path whose basename without extension is the message's
-//     SQLite row ID as a decimal integer (e.g. "42.bin")
+// Each SendJob must have MessageDbFile and MessageDbId set (populated via
+// GetPeerLastMessageDbInfo right after the message is stored).
 func ProcessSentMessages(storagePath string) int {
 	password, _ := client.GetConfig().GetMemPass()
 	queueDir := filepath.Join(storagePath, "queues")
@@ -119,7 +123,6 @@ func ProcessSentMessages(storagePath string) int {
 	}
 
 	updated := 0
-	identity := client.GetConfig().GetIdentity()
 
 	for _, entry := range entries {
 		if entry.IsDir() {
@@ -142,27 +145,19 @@ func ProcessSentMessages(storagePath string) int {
 				continue
 			}
 
-			// Resolve the peer from the queue name to get its DB file list
-			peer := identity.Peers.GetFromUid(queue)
-			if peer == nil || len(peer.DbIds) == 0 {
-				logger.Warn().Str("queue", queue).Msg("ProcessSentMessages: peer not found or has no DB")
-				continue
-			}
-			dbFile := peer.DbIds[len(peer.DbIds)-1]
-
-			// Parse the DB row ID from the job file's basename (e.g. "42.bin" → 42)
-			base := strings.TrimSuffix(filepath.Base(job.File), filepath.Ext(job.File))
-			dbId, err := strconv.ParseInt(base, 10, 64)
-			if err != nil {
-				logger.Error().Err(err).Str("file", job.File).Msg("ProcessSentMessages: parse dbId from filename")
+			if job.MessageDbFile == "" || job.MessageDbId == 0 {
+				logger.Error().Int64("id", job.ID).Str("queue", queue).
+					Msg("ProcessSentMessages: job missing MessageDbFile/MessageDbId — set them via GetPeerLastMessageDbInfo when building the SendJob")
 				continue
 			}
 
 			serverUid := job.Servers[*job.SuccessfulServer].GetUid()
 			receiveTime := uint64(job.SentAt.Unix())
 
-			if err := client.SetMessageServerDelivery(dbFile, dbId, serverUid, receiveTime, password); err != nil {
-				logger.Error().Err(err).Str("queue", queue).Int64("dbId", dbId).Msg("ProcessSentMessages: SetMessageServerDelivery")
+			if err := client.SetMessageServerDelivery(job.MessageDbFile, job.MessageDbId, serverUid, receiveTime, password); err != nil {
+				logger.Error().Err(err).Str("queue", queue).
+					Str("dbFile", job.MessageDbFile).Int64("dbId", job.MessageDbId).
+					Msg("ProcessSentMessages: SetMessageServerDelivery")
 				continue
 			}
 			if err := client.DeleteSendJob(storagePath, queue, job.ID); err != nil {