(∀ (α β) (U (cons 'ok α)
(cons 'error β))))
+(struct User
+ ([uri : Url]
+ [nick : (Option String)]))
+
+(struct User-Agent
+ ([user : User]
+ [prog : Prog]))
+
+(struct Prog
+ ([name : String]
+ [version : String]))
+
(struct Msg
([ts-epoch : Integer]
[ts-orig : String]
- [nick : (Option String)]
- [uri : Url]
+ [from : Peer]
[text : String]
[mentions : (Listof Peer)]))
(struct Peer
([nick : (Option String)]
[uri : Url]
+ [uri-str : String]
[comment : (Option String)])
#:transparent)
[body-input : Input-Port])
#:transparent)
+(: prog Prog)
+(define prog
+ (Prog "tt" (info:#%info-lookup 'version)))
+
+(: user-default User)
+(define user-default
+ (User (string->url "https://github.com/xandkar/tt") #f))
+
+(: user->str (-> User String))
+(define (user->str user)
+ (match-define (User u0 n) user)
+ (define u (url->string u0))
+ (if n
+ (format "+~a; @~a" u n)
+ (format "+~a" u )))
+
+(: user-agent->str (-> User-Agent String))
+(define (user-agent->str ua)
+ (match-define (User-Agent u p) ua)
+ (format "~a/~a (~a)" (Prog-name p) (Prog-version p) (user->str u)))
+
+(: user->user-agent User)
+(define (user->user-agent user)
+ (User-Agent user prog))
+
+(: user-agent-str String)
+(define user-agent-str
+ (user-agent->str (user->user-agent user-default)))
+
+(: set-user-agent-str (-> Path-String Void))
+(define (set-user-agent-str filename)
+ (set! user-agent-str (user-agent->str (user->user-agent (file->user filename))))
+ (log-info "User-Agent string is now set to: ~v" user-agent-str))
+
+(: file->user (-> Path-String User))
+(define (file->user filename)
+ (if (file-exists? filename)
+ (match (file->peers filename)
+ [(list p)
+ (log-info
+ "User-Agent. Found one peer in file: ~v. Using the found peer: ~a"
+ filename
+ (peer->str p))
+ (peer->user p)]
+ [(list* p _)
+ (log-warning
+ "User-Agent. Multiple peers in file: ~v. Picking arbitrary: ~a"
+ filename
+ (peer->str p))
+ (peer->user p)]
+ ['()
+ (log-warning
+ "User-Agent. No peers found in file: ~v. Using the default user: ~a"
+ filename
+ user-default)
+ user-default])
+ (begin
+ (log-warning
+ "User-Agent. File doesn't exist: ~v. Using the default user: ~a"
+ filename
+ user-default)
+ user-default)))
+
+(: peer->user (-> Peer User))
+(define (peer->user p)
+ (match-define (Peer n u _ _) p)
+ (User u n))
+
+(: peers-equal? (-> Peer Peer Boolean))
+(define (peers-equal? p1 p2)
+ (equal? (Peer-uri-str p1)
+ (Peer-uri-str p2)))
+
+(: peer-hash (-> Peer Fixnum))
+(define (peer-hash p)
+ (equal-hash-code (Peer-uri-str p)))
+
+(define-custom-set-types peers
+ #:elem? Peer?
+ peers-equal?
+ peer-hash)
+; XXX Without supplying above explicit hash procedure, we INTERMITTENTLY get
+; the following contract violations:
+;
+; custom-elem-contents: contract violation
+; expected: custom-elem?
+; given: #f
+; context...:
+; /usr/share/racket/collects/racket/private/set-types.rkt:104:0: custom-set->list
+; /home/siraaj/proj/pub/tt/tt.rkt:716:0: crawl
+; /usr/share/racket/collects/racket/cmdline.rkt:191:51
+; body of (submod "/home/siraaj/proj/pub/tt/tt.rkt" main)
+;
+; TODO Investigate why and make a minimal reproducible test case.
+
+(: 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* peer-sets)))
+ (define (merge peers)
+ (match peers
+ ['() (raise 'impossible)]
+ [(list p) p]
+ [(list* p1 p2 ps)
+ (let* ([n1 (Peer-nick p1)]
+ [n2 (Peer-nick p2)]
+ [p (cond
+ ; TODO Try to pick from nicks db: preferred, otherwise seen
+ [(and (not n1) (not n2)) p1]
+ [(and n1 n2 ) p1]
+ [(and n1 (not n2)) p1]
+ [(and (not n1) n2) p2]
+ [else
+ (raise 'impossible)])])
+ (merge (cons p ps)))]))
+ (sort (map merge (hash-values groups))
+ (match-lambda**
+ [((Peer _ _ u1 _) (Peer _ _ u2 _)) (string<? u1 u2)])))
+
+(module+ test
+ (let* ([u1 "http://foo/bar"]
+ [u2 "http://baz/quux"]
+ [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 (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"))
[n (vector-length colors)])
(λ (out-format color-i msg)
(let ([color (vector-ref colors (modulo color-i n))]
- [nick (Msg-nick msg)]
- [uri (url->string (Msg-uri msg))]
- [text (Msg-text msg)]
- [mentions (Msg-mentions msg)])
+ [nick (Peer-nick (Msg-from msg))]
+ [uri (Peer-uri-str (Msg-from msg))]
+ [text (Msg-text msg)])
(match out-format
['single-line
(let ([nick (if nick nick uri)])
(log-debug "Invalid timestamp: ~v" ts)
#f]))))
-(: str->msg (-> (Option String) Url String (Option Msg)))
+(: str->msg (-> Peer String (Option Msg)))
(define str->msg
(let ([re (pregexp "^([^\\s\t]+)[\\s\t]+(.*)$")])
- (λ (nick uri str)
+ (λ (from str)
+ (define from-str (peer->str from))
(define str-head (substring str 0 (min 100 (string-length str))))
(with-handlers*
([exn:fail?
(λ (e)
(log-debug
"Failed to parse msg: ~v, from: ~v, at: ~v, because: ~v"
- str-head nick (url->string uri) e)
+ str-head from-str e)
#f)])
(match (regexp-match re str)
[(list _wholething ts-orig text)
[(list _wholething nick-uri)
(str->peer nick-uri)]))
(regexp-match* #px"@<[^\\s]+([\\s]+)?[^>]+>" text))])
- (Msg ts-epoch ts-orig nick uri text mentions))
+ (Msg ts-epoch ts-orig from text mentions))
(begin
(log-debug
- "Msg rejected due to invalid timestamp: ~v, nick:~v, uri:~v"
- str-head nick (url->string uri))
+ "Msg rejected due to invalid timestamp. From:~v. Line:~v"
+ from-str str-head)
#f)))]
[_
- (log-debug "Non-msg line from nick:~v, line:~a" nick str-head)
+ (log-debug "Non-msg line. From:~v. Line:~v" from-str str-head)
#f])))))
(module+ test
(string-append d h m))]
[tzs (list* "" "Z" tzs)])
(for* ([n '("fake-nick")]
- [u '("fake-uri")]
+ [u '("http://fake-uri")]
+ [p (list (Peer n (string->url u) u #f))]
[s '("" ":10")]
[f '("" ".1337")]
[z tzs]
(let* ([ts (string-append "2020-11-18T22:22"
(if (non-empty-string? s) s ":00")
z)]
- [m (str->msg n u (string-append ts sep txt))])
+ [m (str->msg p (string-append ts sep txt))])
(check-not-false m)
- (check-equal? (Msg-nick m) n)
- (check-equal? (Msg-uri m) u)
+ (check-equal? (Msg-from m) p)
(check-equal? (Msg-text m) txt)
(check-equal? (Msg-ts-orig m) ts (format "Given: ~v" ts))
)))
[tab " "]
[text "Lorem ipsum"]
[nick "foo"]
- [uri "bar"]
- [actual (str->msg nick uri (string-append ts tab text))]
- [expected (Msg 1605756129 ts nick uri text '())])
+ [uri "http://bar/"]
+ [peer (Peer nick (string->url uri) uri #f)]
+ [actual (str->msg peer (string-append ts tab text))]
+ [expected (Msg 1605756129 ts peer text '())])
(check-equal?
(Msg-ts-epoch actual)
(Msg-ts-epoch expected)
(Msg-ts-orig expected)
"str->msg ts-orig")
(check-equal?
- (Msg-nick actual)
- (Msg-nick expected)
+ (Peer-nick (Msg-from actual))
+ (Peer-nick (Msg-from expected))
"str->msg nick")
(check-equal?
- (Msg-uri actual)
- (Msg-uri expected)
+ (Peer-uri (Msg-from actual))
+ (Peer-uri (Msg-from expected))
"str->msg uri")
+ (check-equal?
+ (Peer-uri-str (Msg-from actual))
+ (Peer-uri-str (Msg-from expected))
+ "str->msg uri-str")
(check-equal?
(Msg-text actual)
(Msg-text expected)
(module+ test
(check-equal? (str->lines "abc\ndef\n\nghi") '("abc" "def" "ghi")))
-(: str->msgs (-> (Option String) Url String (Listof Msg)))
-(define (str->msgs nick uri str)
- (filter-map (λ (line) (str->msg nick uri line)) (filter-comments (str->lines str))))
+(: str->msgs (-> Peer String (Listof Msg)))
+(define (str->msgs peer str)
+ (filter-map (λ (line) (str->msg peer line))
+ (filter-comments (str->lines str))))
(: cache-dir Path-String)
(define cache-dir (build-path tt-home-dir "cache"))
(define (url->cache-file-path-v2 uri)
(build-path cache-object-dir (uri-encode (url->string uri))))
-(define url->cache-object-path url->cache-file-path-v2)
-
-(: cache-object-filename->url (-> Path-String Url))
-(define (cache-object-filename->url name)
- (string->url (uri-decode (path->string name))))
+(define url->cache-object-path
+ url->cache-file-path-v2)
(define (url->cache-etag-path uri)
(build-path cache-dir "etags" (uri-encode (url->string uri))))
([exn:fail? (λ (e) #f)])
(string->url s)))
-(: str->peer (String (Option Peer)))
+(: peer->str (-> Peer String))
+(define (peer->str peer)
+ (match-define (Peer n _ u c) peer)
+ (format "~a~a~a"
+ (if n (format "~a " n) "")
+ u
+ (if c (format " # ~a" c) "")))
+
+(: str->peer (-> String (Option Peer)))
(define (str->peer str)
(log-debug "Parsing peer string: ~v" str)
(match
[#f
(log-error "Invalid URI in peer string: ~v" str)
#f]
- [url (Peer nick url comment)])]
+ [url
+ (Peer nick url (url->string url) comment)])]
[_
(log-debug "Invalid peer string: ~v" str)
#f]))
(module+ test
(check-equal?
(str->peer "foo http://bar/file.txt # some rando")
- (Peer "foo" (str->url "http://bar/file.txt") "some rando"))
+ (Peer "foo" (str->url "http://bar/file.txt") "http://bar/file.txt" "some rando"))
(check-equal?
(str->peer "http://bar/file.txt # some rando")
- (Peer #f (str->url "http://bar/file.txt") "some rando"))
+ (Peer #f (str->url "http://bar/file.txt") "http://bar/file.txt" "some rando"))
(check-equal?
(str->peer "http://bar/file.txt #")
- (Peer #f (str->url "http://bar/file.txt") ""))
+ (Peer #f (str->url "http://bar/file.txt") "http://bar/file.txt" ""))
(check-equal?
(str->peer "http://bar/file.txt#") ; XXX URLs can have #s
- (Peer #f (str->url "http://bar/file.txt#") #f))
+ (Peer #f (str->url "http://bar/file.txt#") "http://bar/file.txt#" #f))
(check-equal?
(str->peer "http://bar/file.txt")
- (Peer #f (str->url "http://bar/file.txt") #f))
+ (Peer #f (str->url "http://bar/file.txt") "http://bar/file.txt" #f))
(check-equal?
(str->peer "foo http://bar/file.txt")
- (Peer "foo" (str->url "http://bar/file.txt") #f))
+ (Peer "foo" (str->url "http://bar/file.txt") "http://bar/file.txt" #f))
(check-equal?
(str->peer "foo bar # baz")
#f)
(check-equal?
(str->peer "foo bar://baz # quux")
- (Peer "foo" (str->url "bar://baz") "quux"))
+ (Peer "foo" (str->url "bar://baz") "bar://baz" "quux"))
(check-equal?
(str->peer "foo bar//baz # quux")
#f))
(: peers->file (-> (Listof Peers) Path-String Void))
(define (peers->file peers path)
(display-lines-to-file
- (map (match-lambda
- [(Peer n u c)
- (format "~a~a~a"
- (if n (format "~a " n) "")
- (url->string u)
- (if c (format " # ~a" c) ""))])
- peers)
+ (map peer->str
+ (sort peers
+ (match-lambda**
+ [((Peer n1 _ _ _) (Peer n2 _ _ _))
+ (string<? (if n1 n1 "")
+ (if n2 n2 ""))])))
path
#:exists 'replace))
[_
#f]))
-(: user-agent String)
-(define user-agent
- (let*
- ([prog-name "tt"]
- [prog-version (info:#%info-lookup 'version)]
- [prog-uri "https://github.com/xandkar/tt"]
- [user-peer-file (build-path tt-home-dir "me")]
- [user
- (if (file-exists? user-peer-file)
- (match (first (file->peers user-peer-file))
- [(Peer #f u _) (format "+~a" (url->string u) )]
- [(Peer n u _) (format "+~a; @~a" (url->string u) n)])
- (format "+~a" prog-uri))])
- (format "~a/~a (~a)" prog-name prog-version user)))
-
(: header-get (-> (Listof Bytes) Bytes (Option Bytes)))
(define (header-get headers name)
(match (filter-map (curry extract-field name) headers)
(define-values (status-line headers body-input)
(http-sendrecv/url
u
- #:headers (list (format "User-Agent: ~a" user-agent))))
+ #:headers (list (format "User-Agent: ~a" user-agent-str))))
`(ok . ,(Resp status-line headers body-input))))
(channel-put result-chan result))))
(define result
(: timeline-print (-> Out-Format (Listof Msg) Void))
(define (timeline-print out-format timeline)
- (void (foldl (match-lambda**
- [((and m (Msg _ _ nick _ _ _)) (cons prev-nick i))
- (let ([i (if (equal? prev-nick nick) i (+ 1 i))])
- (msg-print out-format i m)
- (cons nick i))])
- (cons "" 0)
- timeline)))
+ (match timeline
+ ['()
+ (void)]
+ [(cons first-msg _)
+ (void (foldl (match-lambda**
+ [((and m (Msg _ _ from _ _)) (cons prev-from i))
+ (let ([i (if (peers-equal? prev-from from) i (+ 1 i))])
+ (msg-print out-format i m)
+ (cons from i))])
+ (cons (Msg-from first-msg) 0)
+ timeline))]))
(: peer->msgs (-> Peer (Listof Msg)))
(define (peer->msgs peer)
- (match-define (Peer nick uri _) peer)
- (log-debug "Reading peer nick:~v uri:~v" nick (url->string uri))
+ (match-define (Peer nick uri uri-str _) peer)
+ (log-debug "Reading peer nick:~v uri:~v" nick uri-str)
(define msgs-data (uri-read-cached uri))
; TODO Expire cache
(if msgs-data
- (str->msgs nick uri msgs-data)
+ (str->msgs peer msgs-data)
'()))
(: peer-download
(Result (U 'skipped-cached 'downloaded-new)
Any)))
(define (peer-download timeout peer)
- (match-define (Peer nick uri _) peer)
- (define u (url->string uri))
+ (match-define (Peer nick uri u _) peer)
(log-info "Download BEGIN URL:~a" u)
(define-values (results _tm-cpu-ms tm-real-ms _tm-gc-ms)
(time-apply uri-download (list timeout uri)))
(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")))
-(: uniq (∀ (α) (-> (Listof α) (Listof α))))
-(define (uniq xs)
- (set->list (list->set xs)))
-
-(: peers->timeline (-> (listof Peer) (listof Msg)))
+(: peers->timeline (-> (Listof Peer) (Listof Msg)))
(define (peers->timeline peers)
(append* (filter-map peer->msgs peers)))
-(: timeline-sort (-> (listof Msg) timeline-order (Listof Msgs)))
+(: timeline-sort (-> (Listof Msg) timeline-order (Listof Msgs)))
(define (timeline-sort msgs order)
(define cmp (match order
['old->new <]
[paths
(log-debug "Peer ref file paths provided: ~v" paths)
(map string->path paths)])]
- [peers (append* (map file->peers paths))])
+ [peers (apply peers-merge (map file->peers paths))])
(log-info "Read-in ~a peers." (length peers))
- (uniq peers)))
+ peers))
-(: mentioned-peers-in-cache (-> (Listof Peer)))
-(define (mentioned-peers-in-cache)
- ; TODO Expire cache
- (define msgs
- (append* (map (λ (filename)
- (define path (build-path cache-object-dir filename))
- (define size (/ (file-size path) 1000000.0))
- (log-debug "BEGIN parsing ~a MB from file: ~v"
- size
- (path->string path))
- (define t0 (current-inexact-milliseconds))
- (define m (filter-map
- (λ (line)
- (str->msg #f (cache-object-filename->url filename) line))
- (filter-comments
- (file->lines path))))
- (define t1 (current-inexact-milliseconds))
- (log-debug "END parsing ~a MB in ~a seconds from file: ~v."
- size
- (* 0.001 (- t1 t0))
- (path->string path))
- (when (empty? m)
- (log-debug "No messages found in ~a" (path->string path)))
- m)
- (directory-list cache-object-dir))))
- (uniq (append* (map Msg-mentions msgs))))
+(: cache-filename->peer (-> Path-String (Option Peer)))
+(define (cache-filename->peer filename)
+ (define nick #f) ; TODO Look it up in the nick-db when it exists.
+ (define url-str (uri-decode (path->string filename))) ; TODO Can these crash?
+ (match (str->url url-str)
+ [#f #f]
+ [url (Peer nick url url-str #f)]))
+
+(: peers-cached (-> (Listof Peer)))
+(define (peers-cached)
+ ; TODO Expire cache?
+ (filter-map cache-filename->peer (directory-list cache-object-dir)))
+
+(: peers-mentioned (-> (Listof Msg) (Listof Peer)))
+(define (peers-mentioned msgs)
+ (append* (map Msg-mentions msgs)))
(: log-writer-stop (-> Thread Void))
(define (log-writer-stop log-writer)
(current-logger logger)
log-writer))
+; TODO Track timestamps of when a nick was seen.
+; TODO Track number of times a nick was seen.
+(: peers->nicks-by-url (-> (Listof Peer) (Immutable-HashTable Url (Setof String))))
+(define (peers->nicks-by-url peers)
+ (foldl
+ (match-lambda**
+ [((Peer #f _ _ _) tbl) tbl]
+ [((Peer n u _ _) tbl) (hash-update tbl u (λ (nicks) (set-add nicks n)) (set))])
+ (hash)
+ peers))
+
+(: update-nicks-history (-> (Listof Peer) Void))
+(define (update-nicks-history peers)
+ (hash-for-each
+ (peers->nicks-by-url peers)
+ (λ (url nicks-curr)
+ (define path (build-path tt-home-dir "nicks" "seen" (uri-encode (url->string url))))
+ (define nicks-prev
+ (if (file-exists? path)
+ (list->set (file->lines path))
+ (begin
+ (make-parent-directory* path)
+ (set))))
+ (display-lines-to-file
+ (set->list (set-union nicks-prev nicks-curr))
+ path
+ #:exists 'replace))))
+
(: crawl (-> Void))
(define (crawl)
- (let* ([peers-sort
- (λ (peers) (sort peers (match-lambda**
- [((Peer n1 _ _) (Peer n2 _ _))
- (string<? (if n1 n1 "")
- (if n2 n2 ""))])))]
- [peers-all-file
+ ; TODO Test the non-io parts of crawling
+ (let* ([peers-all-file
(build-path tt-home-dir "peers-all")]
[peers-mentioned-file
(build-path tt-home-dir "peers-mentioned")]
[peers-parsed-file
(build-path tt-home-dir "peers-parsed")]
+ [peers-cached-file
+ (build-path tt-home-dir "peers-cached")]
+ [peers-cached
+ (peers-cached)]
+ [cached-timeline
+ (peers->timeline peers-cached)]
[peers-mentioned-curr
- (mentioned-peers-in-cache)]
+ (peers-mentioned cached-timeline)]
[peers-mentioned-prev
(file->peers peers-mentioned-file)]
- [peers-mentioned
- (peers-sort (uniq (append 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 (append peers-cached
+ peers-mentioned-curr
+ peers-mentioned-prev
+ peers-all-prev))
+ (peers-merge peers-mentioned-prev
+ peers-mentioned-curr))]
[peers-all
- (list->set (append peers-mentioned
- peers-all-prev))]
+ (peers-merge peers-mentioned
+ peers-all-prev
+ peers-cached)]
[peers-discovered
- (set-subtract peers-all (list->set peers-all-prev))]
- [peers-all
- (peers-sort (set->list peers-all))]
+ (set->list (set-subtract (make-immutable-peers peers-all)
+ (make-immutable-peers peers-all-prev)))]
[peers-parsed
- (filter
- (λ (p) (< 0 (length (peer->msgs p))))
- peers-all)])
+ (filter (λ (p) (> (length (peer->msgs p)) 0)) peers-all)])
; TODO Deeper de-duping
+ (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
- (λ (p) (cons (Peer-nick p)
- (url->string (Peer-uri p))))
- (set->list peers-discovered))))
+ (match-lambda
+ [(Peer n _ u c) (list n u c)])
+ peers-discovered)))
+ (peers->file peers-cached
+ peers-cached-file)
(peers->file peers-mentioned
peers-mentioned-file)
(peers->file peers-parsed
#:args (command . args)
(define log-writer (log-writer-start log-level))
(current-command-line-arguments (list->vector args))
+ (set-user-agent-str (build-path tt-home-dir "me"))
; TODO dispatch should return status with which we should exit after cleanups
(dispatch command)
(log-writer-stop log-writer))))
home / code / tt.git / blobdiff