Separate lower-level API into separate packages.

cmd/discoverigd/discoverigd.go

@@ -89,7 +89,7 @@ func main() {
 				}
 			}
 
-			srvClient := goupnp.NewSOAPClient(srv.ControlURL.URL)
+			srvClient := srv.NewSOAPClient()
 
 			{
 				inAction := GetExternalIPAddressRequest{XMLName: xml.Name{Space: goupnp.ServiceTypeWANPPPConnection, Local: "GetExternalIPAddress"}}

device.go

@@ -7,6 +7,9 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+
+	"github.com/huin/goupnp/scpd"
+	"github.com/huin/goupnp/soap"
 )
 
 const (
@@ -147,15 +150,19 @@ func (srv *Service) String() string {
 
 // RequestSCDP requests the SCPD (soap actions and state variables description)
 // for the service.
-func (srv *Service) RequestSCDP() (*SCPD, error) {
+func (srv *Service) RequestSCDP() (*scpd.SCPD, error) {
 	if !srv.SCPDURL.Ok {
 		return nil, errors.New("bad/missing SCPD URL, or no URLBase has been set")
 	}
-	scpd := new(SCPD)
+	s := new(scpd.SCPD)
-	if err := requestXml(srv.SCPDURL.URL.String(), SCPDXMLNamespace, scpd); err != nil {
+	if err := requestXml(srv.SCPDURL.URL.String(), scpd.SCPDXMLNamespace, s); err != nil {
 		return nil, err
 	}
-	return scpd, nil
+	return s, nil
+}
+
+func (srv *Service) NewSOAPClient() *soap.SOAPClient {
+	return soap.NewSOAPClient(srv.ControlURL.URL)
 }
 
 // URLField is a URL that is part of a device description.

goupnp.go

@@ -6,6 +6,9 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+
+	"github.com/huin/goupnp/httpu"
+	"github.com/huin/goupnp/ssdp"
 )
 
 // Non-exhaustive set of UPnP service types.
@@ -46,12 +49,12 @@ type MaybeRootDevice struct {
 // returned for errors while attempting to send the query. An error or
 // RootDevice is returned for each discovered service.
 func DiscoverDevices(searchTarget string) ([]MaybeRootDevice, error) {
-	httpu, err := NewHTTPUClient()
+	httpu, err := httpu.NewHTTPUClient()
 	if err != nil {
 		return nil, err
 	}
 	defer httpu.Close()
-	responses, err := SSDPRawSearch(httpu, string(searchTarget), 2, 3)
+	responses, err := ssdp.SSDPRawSearch(httpu, string(searchTarget), 2, 3)
 	if err != nil {
 		return nil, err
 	}

httpu/httpu.go

@@ -1,4 +1,4 @@
-package goupnp
+package httpu
 
 import (
 	"bufio"

scpd.go

@@ -1,53 +0,0 @@
-package goupnp
-
-import (
-	"encoding/xml"
-)
-
-const (
-	SCPDXMLNamespace = "urn:schemas-upnp-org:service-1-0"
-)
-
-// SCPD is the service description as described by section 2.5 "Service
-// description" in
-// http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf
-type SCPD struct {
-	XMLName        xml.Name        `xml:"scpd"`
-	ConfigId       string          `xml:"configId,attr"`
-	SpecVersion    SpecVersion     `xml:"specVersion"`
-	Actions        []Action        `xml:"actionList>action"`
-	StateVariables []StateVariable `xml:"serviceStateTable>stateVariable"`
-}
-
-type Action struct {
-	Name      string     `xml:"name"`
-	Arguments []Argument `xml:"argumentList>argument"`
-}
-
-type Argument struct {
-	Name                 string `xml:"name"`
-	Direction            string `xml:"direction"`            // in|out
-	RelatedStateVariable string `xml:"relatedStateVariable"` // ?
-	Retval               string `xml:"retval"`               // ?
-}
-
-type StateVariable struct {
-	Name              string            `xml:"name"`
-	SendEvents        string            `xml:"sendEvents,attr"` // yes|no
-	Multicast         string            `xml:"multicast,attr"`  // yes|no
-	DataType          DataType          `xml:"dataType"`
-	DefaultValue      string            `xml:"defaultValue"`
-	AllowedValueRange AllowedValueRange `xml:"allowedValueRange"`
-	AllowedValue      []string          `xml:"allowedValueList>allowedValue"`
-}
-
-type AllowedValueRange struct {
-	Minimum string `xml:"minimum"`
-	Maximum string `xml:"maximum"`
-	Step    string `xml:"step"`
-}
-
-type DataType struct {
-	Name string `xml:",chardata"`
-	Type string `xml:"type,attr"`
-}

soap/soap.go

@@ -1,6 +1,6 @@
 // Definition for the SOAP structure required for UPnP's SOAP usage.
 
-package goupnp
+package soap
 
 import (
 	"bytes"

ssdp/ssdp.go

@@ -1,4 +1,4 @@
-package goupnp
+package ssdp
 
 import (
 	"errors"
@@ -7,6 +7,8 @@ import (
 	"net/url"
 	"strconv"
 	"time"
+
+	"github.com/huin/goupnp/httpu"
 )
 
 const (
@@ -22,7 +24,7 @@ const (
 // implementation waits an additional 100ms for responses to arrive), 2 is a
 // reasonable value for this. numSends is the number of requests to send - 3 is
 // a reasonable value for this.
-func SSDPRawSearch(httpu *HTTPUClient, searchTarget string, maxWaitSeconds int, numSends int) ([]*http.Response, error) {
+func SSDPRawSearch(httpu *httpu.HTTPUClient, searchTarget string, maxWaitSeconds int, numSends int) ([]*http.Response, error) {
 	if maxWaitSeconds < 1 {
 		return nil, errors.New("ssdp: maxWaitSeconds must be >= 1")
 	}