karmanyaahm
/
unified-push-xmpp
forked from genofire/unified-push-xmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a

This commit is contained in:
Karmanyaah Malhotra 2021-09-15 22:14:59 -05:00
parent 5d34dfb506
commit b461e5f926
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distributor/go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/google/uuid v1.3.0 github.com/google/uuid v1.3.0
mellium.im/sasl v0.2.1 mellium.im/sasl v0.2.1
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c
mellium.im/xmpp v0.19.0 mellium.im/xmpp v0.19.1-0.20210901124536-6846e6241769
unifiedpush.org/go/np2p_dbus v0.0.0-20210916024230-0bcac24079b3 unifiedpush.org/go/np2p_dbus v0.0.0-20210916024230-0bcac24079b3
) )

3
distributor/go.sum
View File

@ -741,8 +741,9 @@ mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ= mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c h1:1RCzOXu94kvNjuCC89G+5XTP6GOdoDrLsYdGIryyc2Y= mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c h1:1RCzOXu94kvNjuCC89G+5XTP6GOdoDrLsYdGIryyc2Y=
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c/go.mod h1:7SUlP7f2qnMczK+Cu/OFgqaIhldMolVjo8np7xG41D0= mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c/go.mod h1:7SUlP7f2qnMczK+Cu/OFgqaIhldMolVjo8np7xG41D0=
mellium.im/xmpp v0.19.0 h1:zgW0jOOxEfQn8v+zUsInaZikSa8BELpKpvnTYzM435E=
mellium.im/xmpp v0.19.0/go.mod h1:zpU69WRb0YuYcVTM/GVweZQP8r48nj1Tlq8RLXUOSNE= mellium.im/xmpp v0.19.0/go.mod h1:zpU69WRb0YuYcVTM/GVweZQP8r48nj1Tlq8RLXUOSNE=
mellium.im/xmpp v0.19.1-0.20210901124536-6846e6241769 h1:V//oZVgzyQF427rqMAKFHfKLA7gbeTuPbENK3S8DPTU=
mellium.im/xmpp v0.19.1-0.20210901124536-6846e6241769/go.mod h1:zpU69WRb0YuYcVTM/GVweZQP8r48nj1Tlq8RLXUOSNE=
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

16
distributor/xmpp.go
View File

@ -14,6 +14,7 @@ import (
"mellium.im/xmlstream" "mellium.im/xmlstream"
"mellium.im/xmpp" "mellium.im/xmpp"
"mellium.im/xmpp/disco" "mellium.im/xmpp/disco"
"mellium.im/xmpp/history"
"mellium.im/xmpp/jid" "mellium.im/xmpp/jid"
"mellium.im/xmpp/mux" "mellium.im/xmpp/mux"
"mellium.im/xmpp/stanza" "mellium.im/xmpp/stanza"
@ -93,15 +94,24 @@ func (s *XMPPService) Run(dbus *distributor.DBus, store *storage.Storage) error
} }
}() }()
log.Debug("xmpp client is running") log.Debug("xmpp client is running")
go func() {
log.Debug("starting fetch")
q := history.Query{Start: time.Now().Add(-2 * time.Hour), With: s.gateway.Bare(), Limit: 100}
_, _ = history.Fetch(context.TODO(), q, s.session.LocalAddr().Bare(), s.session)
log.Debug("ending fetch")
}()
s.session.Serve(mux.New( s.session.Serve(mux.New(
// disco.Handle(), // disco.Handle(),
mux.MessageFunc("", xml.Name{Local: "subject"}, s.message), mux.MessageFunc("", xml.Name{Local: "subject"}, s.HandleMessage),
history.Handle(history.NewHandler(s)),
)) ))
return nil return nil
} }
// handler of incoming message - forward to DBUS // handler of incoming HandleMessage - forward to DBUS
func (s *XMPPService) message(msgHead stanza.Message, t xmlstream.TokenReadEncoder) error { func (s *XMPPService) HandleMessage(msgHead stanza.Message, t xmlstream.TokenReadEncoder) error {
logger := log.WithFields(map[string]interface{}{ logger := log.WithFields(map[string]interface{}{
"to": msgHead.To.String(), "to": msgHead.To.String(),
"from": msgHead.From.String(), "from": msgHead.From.String(),