Refactor and move parsing and stanza to a separate package

_examples/delegation/delegation.go

@@ -6,6 +6,7 @@ import (
 	"log"
 
 	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 func main() {
@@ -23,8 +24,8 @@ func main() {
 	router := xmpp.NewRouter()
 	router.HandleFunc("message", handleMessage)
 	router.NewRoute().
-		IQNamespaces(xmpp.NSDiscoInfo).
-		HandlerFunc(func(s xmpp.Sender, p xmpp.Packet) {
+		IQNamespaces(stanza.NSDiscoInfo).
+		HandlerFunc(func(s xmpp.Sender, p stanza.Packet) {
 			discoInfo(s, p, opts)
 		})
 	router.NewRoute().
@@ -43,14 +44,14 @@ func main() {
 	log.Fatal(cm.Run())
 }
 
-func handleMessage(_ xmpp.Sender, p xmpp.Packet) {
-	msg, ok := p.(xmpp.Message)
+func handleMessage(_ xmpp.Sender, p stanza.Packet) {
+	msg, ok := p.(stanza.Message)
 	if !ok {
 		return
 	}
 	var msgProcessed bool
 	for _, ext := range msg.Extensions {
-		delegation, ok := ext.(*xmpp.Delegation)
+		delegation, ok := ext.(*stanza.Delegation)
 		if ok {
 			msgProcessed = true
 			fmt.Printf("Delegation confirmed for namespace %s\n", delegation.Delegated.Namespace)
@@ -72,18 +73,18 @@ const (
 // TODO: replace xmpp.Sender by ctx xmpp.Context ?
 // ctx.Stream.Send / SendRaw
 // ctx.Opts
-func discoInfo(c xmpp.Sender, p xmpp.Packet, opts xmpp.ComponentOptions) {
+func discoInfo(c xmpp.Sender, p stanza.Packet, opts xmpp.ComponentOptions) {
 	// Type conversion & sanity checks
-	iq, ok := p.(xmpp.IQ)
+	iq, ok := p.(stanza.IQ)
 	if !ok {
 		return
 	}
-	info, ok := iq.Payload.(*xmpp.DiscoInfo)
+	info, ok := iq.Payload.(*stanza.DiscoInfo)
 	if !ok {
 		return
 	}
 
-	iqResp := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id})
+	iqResp := stanza.NewIQ(stanza.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id})
 
 	switch info.Node {
 	case "":
@@ -97,22 +98,22 @@ func discoInfo(c xmpp.Sender, p xmpp.Packet, opts xmpp.ComponentOptions) {
 	_ = c.Send(iqResp)
 }
 
-func discoInfoRoot(iqResp *xmpp.IQ, opts xmpp.ComponentOptions) {
+func discoInfoRoot(iqResp *stanza.IQ, opts xmpp.ComponentOptions) {
 	// Higher level discovery
-	identity := xmpp.Identity{
+	identity := stanza.Identity{
 		Name:     opts.Name,
 		Category: opts.Category,
 		Type:     opts.Type,
 	}
-	payload := xmpp.DiscoInfo{
+	payload := stanza.DiscoInfo{
 		XMLName: xml.Name{
-			Space: xmpp.NSDiscoInfo,
+			Space: stanza.NSDiscoInfo,
 			Local: "query",
 		},
 		Identity: identity,
-		Features: []xmpp.Feature{
-			{Var: xmpp.NSDiscoInfo},
-			{Var: xmpp.NSDiscoItems},
+		Features: []stanza.Feature{
+			{Var: stanza.NSDiscoInfo},
+			{Var: stanza.NSDiscoItems},
 			{Var: "jabber:iq:version"},
 			{Var: "urn:xmpp:delegation:1"},
 		},
@@ -120,14 +121,14 @@ func discoInfoRoot(iqResp *xmpp.IQ, opts xmpp.ComponentOptions) {
 	iqResp.Payload = &payload
 }
 
-func discoInfoPubSub(iqResp *xmpp.IQ) {
-	payload := xmpp.DiscoInfo{
+func discoInfoPubSub(iqResp *stanza.IQ) {
+	payload := stanza.DiscoInfo{
 		XMLName: xml.Name{
-			Space: xmpp.NSDiscoInfo,
+			Space: stanza.NSDiscoInfo,
 			Local: "query",
 		},
 		Node: pubsubNode,
-		Features: []xmpp.Feature{
+		Features: []stanza.Feature{
 			{Var: "http://jabber.org/protocol/pubsub"},
 			{Var: "http://jabber.org/protocol/pubsub#publish"},
 			{Var: "http://jabber.org/protocol/pubsub#subscribe"},
@@ -137,19 +138,19 @@ func discoInfoPubSub(iqResp *xmpp.IQ) {
 	iqResp.Payload = &payload
 }
 
-func discoInfoPEP(iqResp *xmpp.IQ) {
-	identity := xmpp.Identity{
+func discoInfoPEP(iqResp *stanza.IQ) {
+	identity := stanza.Identity{
 		Category: "pubsub",
 		Type:     "pep",
 	}
-	payload := xmpp.DiscoInfo{
+	payload := stanza.DiscoInfo{
 		XMLName: xml.Name{
-			Space: xmpp.NSDiscoInfo,
+			Space: stanza.NSDiscoInfo,
 			Local: "query",
 		},
 		Identity: identity,
 		Node:     pepNode,
-		Features: []xmpp.Feature{
+		Features: []stanza.Feature{
 			{Var: "http://jabber.org/protocol/pubsub#access-presence"},
 			{Var: "http://jabber.org/protocol/pubsub#auto-create"},
 			{Var: "http://jabber.org/protocol/pubsub#auto-subscribe"},
@@ -166,25 +167,25 @@ func discoInfoPEP(iqResp *xmpp.IQ) {
 	iqResp.Payload = &payload
 }
 
-func handleDelegation(s xmpp.Sender, p xmpp.Packet) {
+func handleDelegation(s xmpp.Sender, p stanza.Packet) {
 	// Type conversion & sanity checks
-	iq, ok := p.(xmpp.IQ)
+	iq, ok := p.(stanza.IQ)
 	if !ok {
 		return
 	}
 
-	delegation, ok := iq.Payload.(*xmpp.Delegation)
+	delegation, ok := iq.Payload.(*stanza.Delegation)
 	if !ok {
 		return
 	}
 	forwardedPacket := delegation.Forwarded.Stanza
 	fmt.Println(forwardedPacket)
-	forwardedIQ, ok := forwardedPacket.(xmpp.IQ)
+	forwardedIQ, ok := forwardedPacket.(stanza.IQ)
 	if !ok {
 		return
 	}
 
-	pubsub, ok := forwardedIQ.Payload.(*xmpp.PubSub)
+	pubsub, ok := forwardedIQ.Payload.(*stanza.PubSub)
 	if !ok {
 		// We only support pubsub delegation
 		return
@@ -192,8 +193,8 @@ func handleDelegation(s xmpp.Sender, p xmpp.Packet) {
 
 	if pubsub.Publish.XMLName.Local == "publish" {
 		// Prepare pubsub IQ reply
-		iqResp := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: forwardedIQ.To, To: forwardedIQ.From, Id: forwardedIQ.Id})
-		payload := xmpp.PubSub{
+		iqResp := stanza.NewIQ(stanza.Attrs{Type: "result", From: forwardedIQ.To, To: forwardedIQ.From, Id: forwardedIQ.Id})
+		payload := stanza.PubSub{
 			XMLName: xml.Name{
 				Space: "http://jabber.org/protocol/pubsub",
 				Local: "pubsub",
@@ -201,13 +202,13 @@ func handleDelegation(s xmpp.Sender, p xmpp.Packet) {
 		}
 		iqResp.Payload = &payload
 		// Wrap the reply in delegation 'forward'
-		iqForward := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id})
-		delegPayload := xmpp.Delegation{
+		iqForward := stanza.NewIQ(stanza.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id})
+		delegPayload := stanza.Delegation{
 			XMLName: xml.Name{
 				Space: "urn:xmpp:delegation:1",
 				Local: "delegation",
 			},
-			Forwarded: &xmpp.Forwarded{
+			Forwarded: &stanza.Forwarded{
 				XMLName: xml.Name{
 					Space: "urn:xmpp:forward:0",
 					Local: "forward",

_examples/xmpp_component/xmpp_component.go

@@ -6,6 +6,7 @@ import (
 	"log"
 
 	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 func main() {
@@ -21,12 +22,12 @@ func main() {
 	router := xmpp.NewRouter()
 	router.HandleFunc("message", handleMessage)
 	router.NewRoute().
-		IQNamespaces(xmpp.NSDiscoInfo).
-		HandlerFunc(func(s xmpp.Sender, p xmpp.Packet) {
+		IQNamespaces(stanza.NSDiscoInfo).
+		HandlerFunc(func(s xmpp.Sender, p stanza.Packet) {
 			discoInfo(s, p, opts)
 		})
 	router.NewRoute().
-		IQNamespaces(xmpp.NSDiscoItems).
+		IQNamespaces(stanza.NSDiscoItems).
 		HandlerFunc(discoItems)
 	router.NewRoute().
 		IQNamespaces("jabber:iq:version").
@@ -44,36 +45,36 @@ func main() {
 	log.Fatal(cm.Run())
 }
 
-func handleMessage(_ xmpp.Sender, p xmpp.Packet) {
-	msg, ok := p.(xmpp.Message)
+func handleMessage(_ xmpp.Sender, p stanza.Packet) {
+	msg, ok := p.(stanza.Message)
 	if !ok {
 		return
 	}
 	fmt.Println("Received message:", msg.Body)
 }
 
-func discoInfo(c xmpp.Sender, p xmpp.Packet, opts xmpp.ComponentOptions) {
+func discoInfo(c xmpp.Sender, p stanza.Packet, opts xmpp.ComponentOptions) {
 	// Type conversion & sanity checks
-	iq, ok := p.(xmpp.IQ)
+	iq, ok := p.(stanza.IQ)
 	if !ok || iq.Type != "get" {
 		return
 	}
 
-	iqResp := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
-	identity := xmpp.Identity{
+	iqResp := stanza.NewIQ(stanza.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
+	identity := stanza.Identity{
 		Name:     opts.Name,
 		Category: opts.Category,
 		Type:     opts.Type,
 	}
-	payload := xmpp.DiscoInfo{
+	payload := stanza.DiscoInfo{
 		XMLName: xml.Name{
-			Space: xmpp.NSDiscoInfo,
+			Space: stanza.NSDiscoInfo,
 			Local: "query",
 		},
 		Identity: identity,
-		Features: []xmpp.Feature{
-			{Var: xmpp.NSDiscoInfo},
-			{Var: xmpp.NSDiscoItems},
+		Features: []stanza.Feature{
+			{Var: stanza.NSDiscoInfo},
+			{Var: stanza.NSDiscoItems},
 			{Var: "jabber:iq:version"},
 			{Var: "urn:xmpp:delegation:1"},
 		},
@@ -83,24 +84,24 @@ func discoInfo(c xmpp.Sender, p xmpp.Packet, opts xmpp.ComponentOptions) {
 }
 
 // TODO: Handle iq error responses
-func discoItems(c xmpp.Sender, p xmpp.Packet) {
+func discoItems(c xmpp.Sender, p stanza.Packet) {
 	// Type conversion & sanity checks
-	iq, ok := p.(xmpp.IQ)
+	iq, ok := p.(stanza.IQ)
 	if !ok || iq.Type != "get" {
 		return
 	}
 
-	discoItems, ok := iq.Payload.(*xmpp.DiscoItems)
+	discoItems, ok := iq.Payload.(*stanza.DiscoItems)
 	if !ok {
 		return
 	}
 
-	iqResp := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
+	iqResp := stanza.NewIQ(stanza.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
 
-	var payload xmpp.DiscoItems
+	var payload stanza.DiscoItems
 	if discoItems.Node == "" {
-		payload = xmpp.DiscoItems{
-			Items: []xmpp.DiscoItem{
+		payload = stanza.DiscoItems{
+			Items: []stanza.DiscoItem{
 				{Name: "test node", JID: "service.localhost", Node: "node1"},
 			},
 		}
@@ -109,15 +110,15 @@ func discoItems(c xmpp.Sender, p xmpp.Packet) {
 	_ = c.Send(iqResp)
 }
 
-func handleVersion(c xmpp.Sender, p xmpp.Packet) {
+func handleVersion(c xmpp.Sender, p stanza.Packet) {
 	// Type conversion & sanity checks
-	iq, ok := p.(xmpp.IQ)
+	iq, ok := p.(stanza.IQ)
 	if !ok {
 		return
 	}
 
-	iqResp := xmpp.NewIQ(xmpp.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
-	var payload xmpp.Version
+	iqResp := stanza.NewIQ(stanza.Attrs{Type: "result", From: iq.To, To: iq.From, Id: iq.Id, Lang: "en"})
+	var payload stanza.Version
 	payload.Name = "Fluux XMPP Component"
 	payload.Version = "0.0.1"
 	iq.Payload = &payload

_examples/xmpp_echo/xmpp_echo.go

@@ -10,6 +10,7 @@ import (
 	"os"
 
 	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 func main() {
@@ -35,15 +36,15 @@ func main() {
 	log.Fatal(cm.Run())
 }
 
-func handleMessage(s xmpp.Sender, p xmpp.Packet) {
-	msg, ok := p.(xmpp.Message)
+func handleMessage(s xmpp.Sender, p stanza.Packet) {
+	msg, ok := p.(stanza.Message)
 	if !ok {
 		_, _ = fmt.Fprintf(os.Stdout, "Ignoring packet: %T\n", p)
 		return
 	}
 
 	_, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From)
-	reply := xmpp.Message{Attrs: xmpp.Attrs{To: msg.From}, Body: msg.Body}
+	reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: msg.Body}
 	_ = s.Send(reply)
 }
 

_examples/xmpp_jukebox/xmpp_jukebox.go

@@ -12,6 +12,7 @@ import (
 	"github.com/processone/mpg123"
 	"github.com/processone/soundcloud"
 	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
 )
 
 // Get the actual song Stream URL from SoundCloud website song URL and play it with mpg123 player.
@@ -41,12 +42,12 @@ func main() {
 	router := xmpp.NewRouter()
 	router.NewRoute().
 		Packet("message").
-		HandlerFunc(func(s xmpp.Sender, p xmpp.Packet) {
+		HandlerFunc(func(s xmpp.Sender, p stanza.Packet) {
 			handleMessage(s, p, player)
 		})
 	router.NewRoute().
 		Packet("message").
-		HandlerFunc(func(s xmpp.Sender, p xmpp.Packet) {
+		HandlerFunc(func(s xmpp.Sender, p stanza.Packet) {
 			handleIQ(s, p, player)
 		})
 
@@ -59,8 +60,8 @@ func main() {
 	log.Fatal(cm.Run())
 }
 
-func handleMessage(s xmpp.Sender, p xmpp.Packet, player *mpg123.Player) {
-	msg, ok := p.(xmpp.Message)
+func handleMessage(s xmpp.Sender, p stanza.Packet, player *mpg123.Player) {
+	msg, ok := p.(stanza.Message)
 	if !ok {
 		return
 	}
@@ -73,14 +74,14 @@ func handleMessage(s xmpp.Sender, p xmpp.Packet, player *mpg123.Player) {
 	}
 }
 
-func handleIQ(s xmpp.Sender, p xmpp.Packet, player *mpg123.Player) {
-	iq, ok := p.(xmpp.IQ)
+func handleIQ(s xmpp.Sender, p stanza.Packet, player *mpg123.Player) {
+	iq, ok := p.(stanza.IQ)
 	if !ok {
 		return
 	}
 	switch payload := iq.Payload.(type) {
 	// We support IOT Control IQ
-	case *xmpp.ControlSet:
+	case *stanza.ControlSet:
 		var url string
 		for _, element := range payload.Fields {
 			if element.XMLName.Local == "string" && element.Name == "url" {
@@ -90,9 +91,9 @@ func handleIQ(s xmpp.Sender, p xmpp.Packet, player *mpg123.Player) {
 		}
 
 		playSCURL(player, url)
-		setResponse := new(xmpp.ControlSetResponse)
+		setResponse := new(stanza.ControlSetResponse)
 		// FIXME: Broken
-		reply := xmpp.IQ{Attrs: xmpp.Attrs{To: iq.From, Type: "result", Id: iq.Id}, Payload: setResponse}
+		reply := stanza.IQ{Attrs: stanza.Attrs{To: iq.From, Type: "result", Id: iq.Id}, Payload: setResponse}
 		_ = s.Send(reply)
 		// TODO add Soundclound artist / title retrieval
 		sendUserTune(s, "Radiohead", "Spectre")
@@ -102,9 +103,9 @@ func handleIQ(s xmpp.Sender, p xmpp.Packet, player *mpg123.Player) {
 }
 
 func sendUserTune(s xmpp.Sender, artist string, title string) {
-	tune := xmpp.Tune{Artist: artist, Title: title}
-	iq := xmpp.NewIQ(xmpp.Attrs{Type: "set", Id: "usertune-1", Lang: "en"})
-	payload := xmpp.PubSub{Publish: &xmpp.Publish{Node: "http://jabber.org/protocol/tune", Item: xmpp.Item{Tune: &tune}}}
+	tune := stanza.Tune{Artist: artist, Title: title}
+	iq := stanza.NewIQ(stanza.Attrs{Type: "set", Id: "usertune-1", Lang: "en"})
+	payload := stanza.PubSub{Publish: &stanza.Publish{Node: "http://jabber.org/protocol/tune", Item: stanza.Item{Tune: &tune}}}
 	iq.Payload = &payload
 	_ = s.Send(iq)
 }