@ -31,22 +31,18 @@ public final class SnodeAPI {
// I f w e h a v e a n y c o n f i g h a s h e s t o r e f r e s h T T L s t h e n a d d t h o s e r e q u e s t s f i r s t
if ! refreshingConfigHashes . isEmpty {
let updatedExpiryMS : Int64 = (
dependencies [ cache : . snodeAPI ] . currentOffsetTimestampMs ( ) +
( 30 * 24 * 60 * 60 * 1000 ) // 3 0 d a y s
)
requests . append (
try SnodeAPI . prepareRequest (
request : Request (
endpoint : . expire ,
swarmPublicKey : authMethod . swarmPublicKey ,
body : UpdateExpiryRequest (
messageHashes : refreshingConfigHashes ,
expiryMs : UInt64 (
dependencies [ cache : . snodeAPI ] . currentOffsetTimestampMs ( ) +
( 30 * 24 * 60 * 60 * 1000 ) // 3 0 d a y s
) ,
extend : true ,
authMethod : authMethod
)
) ,
responseType : UpdateExpiryResponse . self ,
try SnodeAPI . preparedUpdateExpiry (
serverHashes : refreshingConfigHashes ,
updatedExpiryMs : updatedExpiryMS ,
extendOnly : true ,
ignoreValidationFailure : true ,
explicitTargetNode : snode ,
authMethod : authMethod ,
using : dependencies
)
)
@ -78,39 +74,6 @@ public final class SnodeAPI {
let messageResponses : [ Network . BatchSubResponse < PreparedGetMessagesResponse > ] = batchResponse
. compactMap { $0 as ? Network . BatchSubResponse < PreparedGetMessagesResponse > }
// / S i n c e w e h a v e e x t e n d e d t h e T T L f o r a n u m b e r o f m e s s a g e s w e n e e d t o m a k e s u r e w e u p d a t e t h e l o c a l
// / ` S n o d e R e c e i v e d M e s s a g e I n f o . e x p i r a t i o n D a t e M s ` v a l u e s s o w e d o n ' t e n d u p d e l e t i n g t h e m
// / i n c o r r e c t l y b e f o r e t h e y a c t u a l l y e x p i r e o n t h e s w a r m
if
! refreshingConfigHashes . isEmpty ,
let refreshTTLSubReponse : Network . BatchSubResponse < UpdateExpiryResponse > = batchResponse
. first ( where : { $0 is Network . BatchSubResponse < UpdateExpiryResponse > } )
. asType ( Network . BatchSubResponse < UpdateExpiryResponse > . self ) ,
let refreshTTLResponse : UpdateExpiryResponse = refreshTTLSubReponse . body ,
let validResults : [ String : UpdateExpiryResponseResult ] = try ? refreshTTLResponse . validResultMap (
swarmPublicKey : authMethod . swarmPublicKey ,
validationData : refreshingConfigHashes ,
using : dependencies
) ,
let targetResult : UpdateExpiryResponseResult = validResults [ snode . ed25519PubkeyHex ] ,
let groupedExpiryResult : [ UInt64 : [ String ] ] = targetResult . changed
. updated ( with : targetResult . unchanged )
. groupedByValue ( )
. nullIfEmpty ( )
{
dependencies [ singleton : . storage ] . writeAsync { db in
try groupedExpiryResult . forEach { updatedExpiry , hashes in
try SnodeReceivedMessageInfo
. filter ( hashes . contains ( SnodeReceivedMessageInfo . Columns . hash ) )
. updateAll (
db ,
SnodeReceivedMessageInfo . Columns . expirationDateMs
. set ( to : updatedExpiry )
)
}
}
}
return zip ( namespaces , messageResponses )
. reduce ( into : [ : ] ) { result , next in
guard let messageResponse : PreparedGetMessagesResponse = next . 1. body else { return }
@ -404,6 +367,8 @@ public final class SnodeAPI {
updatedExpiryMs : Int64 ,
shortenOnly : Bool ? = nil ,
extendOnly : Bool ? = nil ,
ignoreValidationFailure : Bool = false ,
explicitTargetNode : LibSession . Snode ? = nil ,
authMethod : AuthenticationMethod ,
using dependencies : Dependencies
) throws -> Network . PreparedRequest < [ String : UpdateExpiryResponseResult ] > {
@ -427,12 +392,53 @@ public final class SnodeAPI {
using : dependencies
)
. tryMap { _ , response -> [ String : UpdateExpiryResponseResult ] in
try response . validResultMap (
swarmPublicKey : authMethod . swarmPublicKey ,
validationData : serverHashes ,
using : dependencies
)
do {
return try response . validResultMap (
swarmPublicKey : authMethod . swarmPublicKey ,
validationData : serverHashes ,
using : dependencies
)
}
catch {
guard ignoreValidationFailure else { throw error }
return [ : ]
}
}
. handleEvents (
receiveOutput : { _ , result in
// / S i n c e w e h a v e u p d a t e d t h e T T L w e n e e d t o m a k e s u r e w e a l s o u p d a t e t h e l o c a l
// / ` S n o d e R e c e i v e d M e s s a g e I n f o . e x p i r a t i o n D a t e M s ` v a l u e s s o t h e y m a t c h t h e u p d a t e d s w a r m , i f
// / w e h a d a s p e c i f i c ` s n o d e ` w e w e ' r e s e n d i n g t h e r e q u e s t t o t h e n w e s h o u l d u s e t h o s e v a l u e s , o t h e r w i s e
// / w e c a n j u s t g r a b t h e f i r s t v a l u e f r o m t h e r e s p o n s e a n d u s e t h a t
let maybeTargetResult : UpdateExpiryResponseResult ? = {
guard let snode : LibSession . Snode = explicitTargetNode else {
return result . first ? . value
}
return result [ snode . ed25519PubkeyHex ]
} ( )
guard
let targetResult : UpdateExpiryResponseResult = maybeTargetResult ,
let groupedExpiryResult : [ UInt64 : [ String ] ] = targetResult . changed
. updated ( with : targetResult . unchanged )
. groupedByValue ( )
. nullIfEmpty ( )
else { return }
dependencies [ singleton : . storage ] . writeAsync { db in
try groupedExpiryResult . forEach { updatedExpiry , hashes in
try SnodeReceivedMessageInfo
. filter ( hashes . contains ( SnodeReceivedMessageInfo . Columns . hash ) )
. updateAll (
db ,
SnodeReceivedMessageInfo . Columns . expirationDateMs
. set ( to : updatedExpiry )
)
}
}
}
)
}
public static func preparedRevokeSubaccounts (
Morgan Pretty
2 months ago