Merge pull request #30 from libsv/fix/path-support

Fix: Add hosted path support to lib

Author: roppa

channel.go

@@ -10,17 +10,17 @@ import (
 	"path"
 )
 
-func (c *Client) getChanelBaseEndpoint() string {
+func (c *Client) getChannelBaseEndpoint() string {
 	u := url.URL{
 		Scheme: c.cfg.httpScheme(),
 		Host:   c.cfg.baseURL,
-		Path:   path.Join("/api", c.cfg.version, "/account"),
+		Path:   path.Join(c.cfg.path, "/api", c.cfg.version, "/account"),
 	}
 	return u.String()
 }
 
 func (c *Client) getTokenBaseEndpoint(accountid int64, channelid string) string {
-	return fmt.Sprintf("%s/%d/channel/%s/api-token", c.getChanelBaseEndpoint(), accountid, channelid)
+	return fmt.Sprintf("%s/%d/channel/%s/api-token", c.getChannelBaseEndpoint(), accountid, channelid)
 }
 
 // ChannelsRequest hold data for get channels request for a particular account
@@ -213,7 +213,7 @@ func (c *Client) Channels(ctx context.Context, r ChannelsRequest) (*ChannelsRepl
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodGet,
-		fmt.Sprintf("%s/%d/channel/list", c.getChanelBaseEndpoint(), r.AccountID),
+		fmt.Sprintf("%s/%d/channel/list", c.getChannelBaseEndpoint(), r.AccountID),
 		nil,
 	)
 	if err != nil {
@@ -233,7 +233,7 @@ func (c *Client) Channel(ctx context.Context, r ChannelRequest) (*ChannelReply,
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodGet,
-		fmt.Sprintf("%s/%d/channel/%s", c.getChanelBaseEndpoint(), r.AccountID, r.ChannelID),
+		fmt.Sprintf("%s/%d/channel/%s", c.getChannelBaseEndpoint(), r.AccountID, r.ChannelID),
 		nil,
 	)
 
@@ -259,7 +259,7 @@ func (c *Client) ChannelUpdate(ctx context.Context, r ChannelUpdateRequest) (*Ch
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodPost,
-		fmt.Sprintf("%s/%d/channel/%s", c.getChanelBaseEndpoint(), r.AccountID, r.ChannelID),
+		fmt.Sprintf("%s/%d/channel/%s", c.getChannelBaseEndpoint(), r.AccountID, r.ChannelID),
 		bytes.NewBuffer(payload),
 	)
 
@@ -280,7 +280,7 @@ func (c *Client) ChannelDelete(ctx context.Context, r ChannelDeleteRequest) erro
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodDelete,
-		fmt.Sprintf("%s/%d/channel/%s", c.getChanelBaseEndpoint(), r.AccountID, r.ChannelID),
+		fmt.Sprintf("%s/%d/channel/%s", c.getChannelBaseEndpoint(), r.AccountID, r.ChannelID),
 		nil,
 	)
 
@@ -301,7 +301,7 @@ func (c *Client) ChannelCreate(ctx context.Context, r ChannelCreateRequest) (*Ch
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodPost,
-		fmt.Sprintf("%s/%d/channel", c.getChanelBaseEndpoint(), r.AccountID),
+		fmt.Sprintf("%s/%d/channel", c.getChannelBaseEndpoint(), r.AccountID),
 		bytes.NewBuffer(payload),
 	)
 

client.go

@@ -71,6 +71,7 @@ type spvConfig struct {
 	insecure   bool // equivalent curl -k
 	tls        bool
 	baseURL    string
+	path       string
 	version    string
 	user       string
 	passwd     string
@@ -118,6 +119,13 @@ func WithBaseURL(url string) SPVConfigFunc {
 	}
 }
 
+// WithPath provide a path on the hosting service (/peerchannels)
+func WithPath(path string) SPVConfigFunc {
+	return func(c *spvConfig) {
+		c.path = path
+	}
+}
+
 // WithVersion provide version string for the rest api
 func WithVersion(v string) SPVConfigFunc {
 	return func(c *spvConfig) {
@@ -399,7 +407,7 @@ func NewWSClient(opts ...SPVConfigFunc) (*WSClient, error) {
 
 // urlPath return the path part of the connection URL
 func (c *WSClient) urlPath() string {
-	return path.Join("/api", c.cfg.version, "/channel", c.cfg.channelID, "/notify")
+	return path.Join(c.cfg.path, "/api", c.cfg.version, "/channel", c.cfg.channelID, "/notify")
 }
 
 // connectServer establish the connection to the server
@@ -454,7 +462,6 @@ func (c *WSClient) Close() {
 // Run establishes the connection and start listening the notification stream
 // process the notification if a callback is provided
 func (c *WSClient) Run() {
-
 	go func() {
 		defer func() {
 			_ = recover()

message.go

@@ -13,7 +13,7 @@ func (c *Client) getMessageBaseEndpoint() string {
 	u := url.URL{
 		Scheme: c.cfg.httpScheme(),
 		Host:   c.cfg.baseURL,
-		Path:   path.Join("/api", c.cfg.version),
+		Path:   path.Join(c.cfg.path, "/api", c.cfg.version),
 	}
 	return u.String()
 }