(∀ (α β) (U (cons 'ok α)
(cons 'error β))))
+(struct Hist
+ ([freq : Nonnegative-Integer]
+ [last : Nonnegative-Integer])
+ #:transparent)
+
+(define-type Nick-Hist
+ (Immutable-HashTable Url (Immutable-HashTable (Option String) Hist)))
+
(struct User
- ([uri : String]
- [nick : (Option String)]))
+ ([uri : Url]
+ [nick : (Option String)]))
(struct User-Agent
- ([user : User]
- [prog : Prog]))
+ ([user : User]
+ [prog : Prog]))
(struct Prog
- ([name : String]
- [version : String]))
+ ([name : String]
+ [version : String]))
(struct Msg
([ts-epoch : Integer]
(: user-default User)
(define user-default
- (User "https://github.com/xandkar/tt" #f))
+ (User (string->url "https://github.com/xandkar/tt") #f))
(: user->str (-> User String))
(define (user->str user)
- (match-define (User u n) user)
+ (match-define (User u0 n) user)
+ (define u (url->string u0))
(if n
- (format "+~a; @~a" u n)
- (format "+~a" u )))
+ (format "+~a; @~a" u n)
+ (format "+~a" u )))
(: user-agent->str (-> User-Agent String))
(define (user-agent->str ua)
(: file->user (-> Path-String User))
(define (file->user filename)
(if (file-exists? filename)
- (match (set->list (file->peers filename))
+ (match (file->peers filename)
[(list p)
(log-info
"User-Agent. Found one peer in file: ~v. Using the found peer: ~a"
user-default)
user-default)))
+(: peer->user (-> Peer User))
(define (peer->user p)
- (match-define (Peer n _ u _) p)
+ (match-define (Peer n u _ _) p)
(User u n))
(: peers-equal? (-> Peer Peer Boolean))
;
; TODO Investigate why and make a minimal reproducible test case.
-(define (peers-union . peer-sets)
+(: peers-merge (-> (Listof Peer) * (Listof Peer)))
+(define (peers-merge . peer-sets)
(define groups
(foldl
(λ (p groups)
(hash-update groups (Peer-uri-str p) (λ (group) (cons p group)) '()))
(hash)
- (append* (map set->list peer-sets))))
+ (append* peer-sets)))
(define (merge peers)
(match peers
['() (raise 'impossible)]
(let* ([n1 (Peer-nick p1)]
[n2 (Peer-nick p2)]
[p (cond
- [(and (not n1) (not n2)) p1]
- [(and n1 n2 ) p1]
+ ; TODO Try to pick from nicks db: preferred, otherwise seen
+ [(and (not n1) (not n2)) p1] ; TODO update with most-common nick
+ [(and n1 n2 ) p1] ; TODO compare which is more-common
[(and n1 (not n2)) p1]
[(and (not n1) n2) p2]
[else
(raise 'impossible)])])
(merge (cons p ps)))]))
- (make-immutable-peers (map merge (hash-values groups))))
+ (sort (map merge (hash-values groups))
+ (match-lambda**
+ [((Peer _ _ u1 _) (Peer _ _ u2 _)) (string<? u1 u2)])))
(module+ test
(let* ([u1 "http://foo/bar"]
[p1 (Peer #f (string->url u1) u1 #f)]
[p2 (Peer "a" (string->url u1) u1 #f)]
[p3 (Peer "b" (string->url u2) u2 #f)]
- [s1 (make-immutable-peers (list p1))]
- [s2 (make-immutable-peers (list p2 p3))])
- (check-true (peers? (peers-union s1 s2)))
- (check-true (peers? (peers-union s2 s1)))
- (check-equal? (list p3 p2) (set->list (peers-union s1 s2)))
- (check-equal? (list p3 p2) (set->list (peers-union s2 s1)))))
+ [s1 (list p1)]
+ [s2 (list p2 p3)])
+ (check-equal? (list p3 p2) (peers-merge s1 s2))
+ (check-equal? (list p3 p2) (peers-merge s2 s1))))
(: tt-home-dir Path-String)
(define tt-home-dir (build-path (expand-user-path "~") ".tt"))
(define (filter-comments lines)
(filter-not (λ (line) (string-prefix? line "#")) lines))
-(: str->peers (-> String (Setof Peer)))
+(: str->peers (-> String (Listof Peer)))
(define (str->peers str)
- (make-immutable-peers (filter-map str->peer (filter-comments (str->lines str)))))
+ (filter-map str->peer (filter-comments (str->lines str))))
-(: peers->file (-> (Setof Peers) Path-String Void))
+(: peers->file (-> (Listof Peers) Path-String Void))
(define (peers->file peers path)
(display-lines-to-file
(map peer->str
- (sort (set->list peers)
+ (sort peers
(match-lambda**
[((Peer n1 _ _ _) (Peer n2 _ _ _))
(string<? (if n1 n1 "")
path
#:exists 'replace))
-(: file->peers (-> Path-String (Setof Peer)))
+(: file->peers (-> Path-String (Listof Peer)))
(define (file->peers file-path)
(if (file-exists? file-path)
(str->peers (file->string file-path))
(begin
(log-warning "File does not exist: ~v" (path->string file-path))
- (make-immutable-peers))))
+ '())))
(define re-rfc2822
#px"^(Mon|Tue|Wed|Thu|Fri|Sat|Sun), ([0-9]{2}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([0-9]{4}) ([0-2][0-9]):([0-6][0-9]):([0-6][0-9]) GMT")
result)
result)
-(: timeline-download (-> Integer Positive-Float (Setof Peer) Void))
+(: timeline-download (-> Integer Positive-Float (Listof Peer) Void))
(define (timeline-download num-workers timeout peers)
(define results
(concurrent-filter-map num-workers
(λ (p) (cons p (peer-download timeout p)))
- (set->list peers)))
+ peers))
(define peers-ok
(filter-map (match-lambda
[(cons p (cons 'ok _)) p]
(peers->file peers-ok (build-path tt-home-dir "peers-last-downloaded-ok"))
(peers->file peers-err (build-path tt-home-dir "peers-last-downloaded-err")))
-(: peers->timeline (-> (Setof Peer) (Listof Msg)))
+(: peers->timeline (-> (Listof Peer) (Listof Msg)))
(define (peers->timeline peers)
- (append* (filter-map peer->msgs (set->list peers))))
+ (append* (filter-map peer->msgs peers)))
(: timeline-sort (-> (Listof Msg) timeline-order (Listof Msgs)))
(define (timeline-sort msgs order)
(sort msgs (λ (a b) (cmp (Msg-ts-epoch a)
(Msg-ts-epoch b)))))
-(: paths->peers (-> (Listof String) (Setof Peer)))
+(: paths->peers (-> (Listof String) (Listof Peer)))
(define (paths->peers paths)
(let* ([paths (match paths
['()
[paths
(log-debug "Peer ref file paths provided: ~v" paths)
(map string->path paths)])]
- [peers (apply peers-union (map file->peers paths))])
- (log-info "Read-in ~a peers." (set-count peers))
+ [peers (apply peers-merge (map file->peers paths))])
+ (log-info "Read-in ~a peers." (length peers))
peers))
(: cache-filename->peer (-> Path-String (Option Peer)))
[#f #f]
[url (Peer nick url url-str #f)]))
-(: peers-cached (-> (Setof Peer)))
+(: peers-cached (-> (Listof Peer)))
(define (peers-cached)
; TODO Expire cache?
- (make-immutable-peers
- (filter-map cache-filename->peer
- (directory-list cache-object-dir))))
+ (filter-map cache-filename->peer (directory-list cache-object-dir)))
-(: peers-mentioned (-> (Listof Msg) (Setof Peer)))
+(: peers-mentioned (-> (Listof Msg) (Listof Peer)))
(define (peers-mentioned msgs)
- (make-immutable-peers (append* (map Msg-mentions msgs))))
+ (append* (map Msg-mentions msgs)))
(: log-writer-stop (-> Thread Void))
(define (log-writer-stop log-writer)
(current-logger logger)
log-writer))
+(: msgs->nick-hist (-> (Listof Msg) Nick-Hist))
+(define (msgs->nick-hist msgs)
+ (foldl
+ (λ (msg url->nick->hist)
+ (match-define (Msg curr _ from _ mentions) msg)
+ (foldl
+ (λ (peer url->nick->hist)
+ (match-define (Peer nick url _ _) peer)
+ (if nick
+ (hash-update url->nick->hist
+ url
+ (λ (nick->hist)
+ (hash-update nick->hist
+ nick
+ (match-lambda
+ [(Hist freq prev)
+ (Hist (+ 1 freq) (max prev curr))])
+ (Hist 0 0)))
+ (hash))
+ url->nick->hist))
+ url->nick->hist
+ (cons from mentions)))
+ (hash)
+ msgs))
+
+(: update-nicks-history (-> (Listof Msg) Void))
+(define (update-nicks-history msgs)
+ (hash-for-each
+ (msgs->nick-hist msgs)
+ (λ (url nick->hist)
+ (define path (build-path tt-home-dir "nicks" "seen" (uri-encode (url->string url))))
+ (make-parent-directory* path)
+ (display-lines-to-file
+ (map (match-lambda
+ [(cons nick (Hist freq last))
+ (format "~a ~a ~a" nick freq last)])
+ (sort (hash->list nick->hist)
+ (match-lambda**
+ [((cons _ (Hist a _)) (cons _ (Hist b _)))
+ (> a b)])))
+ path
+ #:exists 'replace))))
+
+(: nick-hist-most-by (-> Nick-Hist Url (-> Hist Nonnegative-Integer) (Option String)))
+(define (nick-hist-most-by url->nick->hist url by)
+ (match (hash-ref url->nick->hist url #f)
+ [#f #f]
+ [nick->hist
+ (match (sort (hash->list nick->hist)
+ (λ (a b) (> (by (cdr a))
+ (by (cdr b)))))
+ ['() #f]
+ [(cons (cons nick _) _) nick])]))
+
+(: nick-hist-latest (-> Nick-Hist Url (Option String)))
+(define (nick-hist-latest nick-hist url)
+ (nick-hist-most-by nick-hist url Hist-last))
+
+(: nick-hist-common (-> Nick-Hist Url (Option String)))
+(define (nick-hist-common nick-hist url)
+ (nick-hist-most-by nick-hist url Hist-freq))
+
+(module+ test
+ (let* ([url-str "http://foo"]
+ [url (string->url url-str)]
+ [nick1 "a"]
+ [nick2 "b"]
+ [nick3 "c"]
+ [ts-str-1 "2021-11-29T23:29:08-0500"]
+ [ts-str-2 "2021-11-29T23:30:00-0500"]
+ [ts-1 (rfc3339->epoch ts-str-1)]
+ [ts-2 (rfc3339->epoch ts-str-2)]
+ [msgs
+ (map (match-lambda
+ [(cons ts-str nick)
+ (str->msg (str->peer "test http://test")
+ (string-append ts-str " Hi @<" nick " " url-str ">"))])
+ (list (cons ts-str-2 nick1)
+ (cons ts-str-1 nick2)
+ (cons ts-str-1 nick2)
+ (cons ts-str-1 nick3)
+ (cons ts-str-1 nick3)
+ (cons ts-str-1 nick3)))]
+ [hist
+ (msgs->nick-hist msgs)])
+ (check-equal? (hash-ref (hash-ref hist url) nick1) (Hist 1 ts-2))
+ (check-equal? (hash-ref (hash-ref hist url) nick2) (Hist 2 ts-1))
+ (check-equal? (hash-ref (hash-ref hist url) nick3) (Hist 3 ts-1))
+ (check-equal? (nick-hist-common hist url) nick3)
+ (check-equal? (nick-hist-latest hist url) nick1)))
+
(: crawl (-> Void))
(define (crawl)
+ ; TODO Test the non-io parts of crawling
(let* ([peers-all-file
(build-path tt-home-dir "peers-all")]
[peers-mentioned-file
(peers-mentioned cached-timeline)]
[peers-mentioned-prev
(file->peers peers-mentioned-file)]
- [peers-mentioned
- (peers-union peers-mentioned-prev
- peers-mentioned-curr)]
[peers-all-prev
(file->peers peers-all-file)]
+ [peers-mentioned
+ (begin
+ ; XXX Updating nicks before running peers-merge,
+ ; since peers-merge is expected to refer to it in the future.
+ (update-nicks-history cached-timeline)
+ (peers-merge peers-mentioned-prev
+ peers-mentioned-curr))]
[peers-all
- (peers-union peers-mentioned
+ (peers-merge peers-mentioned
peers-all-prev
peers-cached)]
[peers-discovered
- (set-subtract peers-all
- peers-all-prev)]
+ (set->list (set-subtract (make-immutable-peers peers-all)
+ (make-immutable-peers peers-all-prev)))]
[peers-parsed
- (for/set ([p peers-all] #:when (> (length (peer->msgs p)) 0)) p)])
+ (filter (λ (p) (> (length (peer->msgs p)) 0)) peers-all)])
; TODO Deeper de-duping
- (log-info "Known peers cached ~a" (set-count peers-cached))
- (log-info "Known peers mentioned: ~a" (set-count peers-mentioned))
- (log-info "Known peers parsed ~a" (set-count peers-parsed))
- (log-info "Known peers total: ~a" (set-count peers-all))
+ (log-info "Known peers cached ~a" (length peers-cached))
+ (log-info "Known peers mentioned: ~a" (length peers-mentioned))
+ (log-info "Known peers parsed ~a" (length peers-parsed))
+ (log-info "Known peers total: ~a" (length peers-all))
(log-info "Discovered ~a new peers:~n~a"
- (set-count peers-discovered)
+ (length peers-discovered)
(pretty-format (map
(match-lambda
[(Peer n _ u c) (list n u c)])
- (set->list peers-discovered))))
+ peers-discovered)))
(peers->file peers-cached
peers-cached-file)
(peers->file peers-mentioned
(define-values (_res _cpu real-ms _gc)
(time-apply timeline-download (list num-workers timeout peers)))
(log-info "Downloaded timelines from ~a peers in ~a seconds."
- (set-count peers)
+ (length peers)
(/ real-ms 1000.0))))
(: dispatch (-> String Void))
home / code / tt.git / blobdiff