status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust from value to accomodate for late-comers 

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Andrea Maria Piana 2018-12-12 16:56:57 +01:00 committed by Igor Mandrigin
parent fdb808a7dc
commit 8be8f0b5c8
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/status_im/mailserver/core.cljs
View File

@ -11,6 +11,7 @@
[status-im.utils.utils :as utils]
[taoensso.timbre :as log]
[status-im.transport.db :as transport.db]
[status-im.transport.message.protocol :as protocol]
[clojure.string :as string]
[status-im.data-store.mailservers :as data-store.mailservers]
[status-im.i18n :as i18n]
@ -236,26 +237,41 @@
(def limit 200)
(defn adjust-request-for-transit-time
[from]
(let [ttl (:ttl protocol/whisper-opts)
whisper-tolerance (:whisper-drift-tolerance protocol/whisper-opts)
adjustment (+ whisper-tolerance ttl)
adjusted-from (- (max from adjustment) adjustment)]
(log/debug "Adjusting mailserver request" "from:" from "adjusted-from:" adjusted-from)
adjusted-from))
(defn request-messages! [web3 {:keys [sym-key-id address]} {:keys [topics cursor to from]}]
(log/info "mailserver: request-messages for: "
" topics " topics
" from " from
" cursor " cursor
" limit " limit
" to " to)
(.requestMessages (transport.utils/shh web3)
(clj->js {:topics topics
:mailServerPeer address
:symKeyID sym-key-id
:timeout request-timeout
:limit limit
:cursor cursor
:from from
:to to})
(fn [error request-id]
(if-not error
(log/info "mailserver: messages request success for topic " topics "from" from "to" to)
(log/error "mailserver: messages request error for topic " topics ": " error)))))
;; Add some room to from, unless we break day boundaries so that messages that have
;; been received after the last request are also fetched
(let [adjusted-from (adjust-request-for-transit-time from)
actual-from (if (> (- to adjusted-from) one-day)
from
adjusted-from)]
(log/info "mailserver: request-messages for: "
" topics " topics
" from " actual-from
" cursor " cursor
" limit " limit
" to " to)
(.requestMessages (transport.utils/shh web3)
(clj->js {:topics topics
:mailServerPeer address
:symKeyID sym-key-id
:timeout request-timeout
:limit limit
:cursor cursor
:from actual-from
:to to})
(fn [error request-id]
(if-not error
(log/info "mailserver: messages request success for topic " topics "from" from "to" to)
(log/error "mailserver: messages request error for topic " topics ": " error))))))
(re-frame/reg-fx
:mailserver/request-messages

11
src/status_im/transport/message/protocol.cljs
View File

@ -16,10 +16,13 @@
(receive [this chat-id signature timestamp cofx] "Method producing all effects necessary for receiving the message record")
(validate [this] "Method returning the message if it is valid or nil if it is not"))
(def ^:private whisper-opts
{:ttl 10 ;; ttl of 10 sec
:powTarget config/pow-target
:powTime config/pow-time})
(def whisper-opts
{;; time drift that is tolerated by whisper, in seconds
:whisper-drift-tolerance 10
;; ttl of 10 sec
:ttl 10
:powTarget config/pow-target
:powTime config/pow-time})
(fx/defn init-chat
"Initialises chat on protocol layer.