Fix/expose full url on fail

.gitignore

@@ -13,5 +13,5 @@
 coverage.html
 
 .vscode
-
+.idea
 

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/minus5/go-uof-sdk
+go_import_path: github.com/pvotal-tech/go-uof-sdk
 os:
     - linux
     - osx

api/api.go

@@ -4,14 +4,16 @@ package api
 import (
 	"bytes"
 	"context"
+	"crypto/tls"
 	"encoding/xml"
 	"fmt"
 	"io/ioutil"
+	"net/http"
 	"text/template"
 	"time"
 
 	"github.com/hashicorp/go-retryablehttp"
-	"github.com/minus5/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk"
 )
 
 const (
@@ -78,8 +80,23 @@ func ProductionGlobal(exitSig context.Context, token string) (*API, error) {
 	return a, a.Ping()
 }
 
+// DialCustom connects to a custom system
+func DialCustom(exitSig context.Context, customServer, token string) (*API, error) {
+	a := &API{
+		server:  customServer,
+		token:   token,
+		exitSig: exitSig,
+		client:  client(),
+	}
+	return a, a.Ping()
+}
+
 func client() *retryablehttp.Client {
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
 	c := retryablehttp.NewClient()
+	c.HTTPClient.Transport = tr
 	c.Logger = nil
 	c.RetryWaitMin = 1 * time.Second
 	c.RetryWaitMax = 16 * time.Second
@@ -88,42 +105,41 @@ func client() *retryablehttp.Client {
 }
 
 const (
-	recovery     = "/v1/{{.Producer}}/recovery/initiate_request?after={{.Timestamp}}&request_id={{.RequestID}}"
-	fullRecovery = "/v1/{{.Producer}}/recovery/initiate_request?request_id={{.RequestID}}"
-	ping         = "/v1/users/whoami.xml"
+	recovery                   = "/v1/{{.Producer}}/recovery/initiate_request?after={{.Timestamp}}&request_id={{.RequestID}}&node_id={{.NodeID}}"
+	fullRecovery               = "/v1/{{.Producer}}/recovery/initiate_request?request_id={{.RequestID}}&node_id={{.NodeID}}"
+	sportEventRecovery         = "/v1/{{.Producer}}/odds/events/{{.EventURN}}/initiate_request?request_id={{.RequestID}}&node_id={{.NodeID}}"
+	sportEventStatefulRecovery = "/v1/{{.Producer}}/stateful_messages/events/{{.EventURN}}/initiate_request?request_id={{.RequestID}}&node_id={{.NodeID}}"
+	ping                       = "/v1/users/whoami.xml"
 )
 
-func (a *API) RequestRecovery(producer uof.Producer, timestamp int, requestID int) error {
+func (a *API) RequestRecovery(producer uof.Producer, timestamp, requestID, nodeID int) error {
 	if timestamp <= 0 {
-		return a.RequestFullOddsRecovery(producer, requestID)
+		return a.RequestFullOddsRecovery(producer, requestID, nodeID)
 	}
-	return a.RequestRecoverySinceTimestamp(producer, timestamp, requestID)
+	return a.RequestRecoverySinceTimestamp(producer, timestamp, requestID, nodeID)
 }
 
 // RequestRecoverySinceTimestamp does recovery of odds and stateful messages
 // over the feed since after timestamp. Subscribes client to feed messages.
-func (a *API) RequestRecoverySinceTimestamp(producer uof.Producer, timestamp int, requestID int) error {
-	return a.post(recovery, &params{Producer: producer, Timestamp: timestamp, RequestID: requestID})
+func (a *API) RequestRecoverySinceTimestamp(producer uof.Producer, timestamp, requestID, nodeID int) error {
+	return a.post(recovery, &params{Producer: producer, Timestamp: timestamp, RequestID: requestID, NodeID: nodeID})
 }
 
 // RequestFullOddsRecovery does recovery of odds over the feed. Subscribes
 // client to feed messages.
-func (a *API) RequestFullOddsRecovery(producer uof.Producer, requestID int) error {
-	return a.post(fullRecovery, &params{Producer: producer, RequestID: requestID})
+func (a *API) RequestFullOddsRecovery(producer uof.Producer, requestID, nodeID int) error {
+	return a.post(fullRecovery, &params{Producer: producer, RequestID: requestID, NodeID: nodeID})
 }
 
-// // RecoverSportEvent requests to resend all odds for all markets for a sport
-// // event.
-// func (a *Api) RecoverSportEvent(product, eventID string) error {
-// 	return a.post(fmt.Sprintf("/v1/%s/events/%s/initiate_request", product, eventID))
-// }
+// RecoverSportEvent requests to resend all odds for all markets for a sport event.
+func (a *API) RecoverSportEvent(producer uof.Producer, eventURN uof.URN, requestID, nodeID int) error {
+	return a.post(sportEventRecovery, &params{Producer: producer, EventURN: eventURN, RequestID: requestID, NodeID: nodeID})
+}
 
-// // RecoverStatefulForSportEvent requests to resend all stateful-messages
-// // (BetSettlement, RollbackBetSettlement, BetCancel, UndoBetCancel) for a sport
-// // event.
-// func (a *Api) RecoverStatefulForSportEvent(product, eventID string) error {
-// 	return a.post(fmt.Sprintf("/v1/%s/stateful_messages/events/%s/initiate_request", product, eventID))
-// }
+// RecoverStatefulForSportEvent requests to resend all stateful-messages (BetSettlement, RollbackBetSettlement, BetCancel, UndoBetCancel) for a sport event.
+func (a *API) RecoverStatefulForSportEvent(producer uof.Producer, eventURN uof.URN, requestID, nodeID int) error {
+	return a.post(sportEventStatefulRecovery, &params{Producer: producer, EventURN: eventURN, RequestID: requestID, NodeID: nodeID})
+}
 
 func (a *API) Ping() error {
 	_, err := a.get(ping, nil)
@@ -207,6 +223,7 @@ type params struct {
 	UseReplayTimestamp bool
 	Lang               uof.Lang
 	Producer           uof.Producer
+	NodeID             int
 }
 
 func runTemplate(def string, p *params) string {

api/api_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minus5/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk"
 	"github.com/stretchr/testify/assert"
 )
 

api/replay.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 
-	"github.com/minus5/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk"
 )
 
 // replay api paths

api/sports.go

@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"time"
 
-	"github.com/minus5/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk"
 )
 
 const (

bet_settlement.go

@@ -16,9 +16,10 @@ type BetSettlement struct {
 }
 
 type BetSettlementMarket struct {
-	ID         int               `xml:"id,attr" json:"id"`
-	LineID     int               `json:"lineID"`
-	Specifiers map[string]string `json:"specifiers,omitempty"`
+	ID            int               `xml:"id,attr" json:"id"`
+	LineID        int               `json:"lineID"`
+	Specifiers    map[string]string `json:"specifiers,omitempty"`
+	AllSpecifiers string            `json:"allSpecifiers,omitempty"`
 	// Describes the reason for voiding certain outcomes for a particular market.
 	// Only set if at least one of the outcomes have a void_factor. A list of void
 	// reasons can be found above this table or by using the API at
@@ -81,7 +82,8 @@ func (t *BetSettlementMarket) UnmarshalXML(d *xml.Decoder, start xml.StartElemen
 	if err := d.DecodeElement(&overlay, &start); err != nil {
 		return err
 	}
-	t.Specifiers = toSpecifiers(overlay.Specifiers, overlay.ExtendedSpecifiers)
+	t.AllSpecifiers = getAllSpecifiers(overlay.Specifiers, overlay.ExtendedSpecifiers)
+	t.Specifiers = toSpecifiers(t.AllSpecifiers)
 	t.LineID = toLineID(overlay.Specifiers)
 	return nil
 }
@@ -108,12 +110,14 @@ func (t *BetSettlementOutcome) UnmarshalXML(d *xml.Decoder, start xml.StartEleme
 	return nil
 }
 
-//The following list includes all possible combinations of outcome (result) and void_factor:
-//  result="0" and no void_factor: Lose entire bet
-//  result="1" and no void_factor: Win entire bet
-//  result="0" and void_factor="1": Refund entire bet
-//  result="1" and void_factor="0.5": Refund half bet and win other half
-//  result="0" and void_factor="0.5": Refund half bet and lose other half.
+// The following list includes all possible combinations of outcome (result) and void_factor:
+//
+//	result="0" and no void_factor: Lose entire bet
+//	result="1" and no void_factor: Win entire bet
+//	result="0" and void_factor="1": Refund entire bet
+//	result="1" and void_factor="0.5": Refund half bet and win other half
+//	result="0" and void_factor="0.5": Refund half bet and lose other half.
+//
 // If the bet on an outcome should be refunded completely void-factor is set to
 // 1.0. If half of the bet on an outcome should be refunded void_factor is set
 // to 0.5.

cmd/client/main.go

@@ -6,17 +6,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/pvotal-tech/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk/sdk"
 	"log"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
-
-	"github.com/minus5/go-uof-sdk"
-	"github.com/minus5/go-uof-sdk/pipe"
-	"github.com/minus5/go-uof-sdk/sdk"
 )
 
 const (
@@ -32,16 +30,6 @@ func env(name string) string {
 	return e
 }
 
-var (
-	bookmakerID string
-	token       string
-)
-
-func init() {
-	token = env(EnvToken)
-	bookmakerID = env(EnvBookmakerID)
-}
-
 func debugHTTP() {
 	if err := http.ListenAndServe("localhost:8124", nil); err != nil {
 		log.Fatal(err)
@@ -61,24 +49,30 @@ func exitSignal() context.Context {
 }
 
 func main() {
+	go func() {
+		_ = http.ListenAndServe(fmt.Sprintf(":%d", 6060), nil)
+	}()
 	go debugHTTP()
 
-	preloadTo := time.Now().Add(24 * time.Hour)
+	//preloadTo := time.Now().Add(24 * time.Hour)
 
-	timestamp := uof.CurrentTimestamp() - 5*60*1000 // -5 minutes
+	timestamp := uof.CurrentTimestamp() - 12*60*60*1000 // -5 minutes
 	var pc uof.ProducersChange
 	pc.Add(uof.ProducerPrematch, timestamp)
 	pc.Add(uof.ProducerLiveOdds, timestamp)
+	pc.Add(uof.ProducerBetPal, timestamp)
+	pc.Add(uof.ProducerPremiumCricket, timestamp)
 
 	err := sdk.Run(exitSignal(),
-		sdk.Credentials(bookmakerID, token),
+		sdk.Credentials(123456, "token_goes_here", 123),
 		sdk.Staging(),
 		sdk.Recovery(pc),
-		sdk.Fixtures(preloadTo),
-		sdk.Languages(uof.Languages("en,de,hr")),
-		sdk.BufferedConsumer(pipe.FileStore("./tmp"), 1024),
+		sdk.ConfigThrottle(true),
+		//sdk.Fixtures(preloadTo),
+		sdk.Languages(uof.Languages("en")),
+		//sdk.BufferedConsumer(pipe.FileStore("./tmp"), 1024),
 		sdk.Consumer(logMessages),
-		sdk.ListenErrors(listenSDKErrors),
+		//sdk.ListenErrors(listenSDKErrors),
 	)
 	if err != nil {
 		log.Fatal(err)
@@ -88,12 +82,32 @@ func main() {
 // consumer of incoming messages
 func logMessages(in <-chan *uof.Message) error {
 	for m := range in {
-		logMessage(m)
+		processMessage(m)
 	}
 	return nil
 }
 
-func logMessage(m *uof.Message) {
+func processMessage(m *uof.Message) {
+	var pendingCount, p, requestID, sport string
+	if m.External {
+		pendingCount = fmt.Sprintf("pending=%d", m.PendingMsgCount)
+		p = fmt.Sprintf("producer=%s", m.Producer.Code())
+		if m.Type == uof.MessageTypeBetSettlement {
+			if m.BetSettlement.RequestID != nil {
+				requestID = fmt.Sprintf("requestID=%d", *m.BetSettlement.RequestID)
+			}
+			sport = fmt.Sprintf("sportID=%d", m.SportID)
+		}
+		if m.Type == uof.MessageTypeOddsChange {
+			if m.OddsChange.RequestID != nil {
+				requestID = fmt.Sprintf("requestID=%d", *m.OddsChange.RequestID)
+			}
+			sport = fmt.Sprintf("sportID=%d", m.SportID)
+		}
+	}
+	fmt.Printf("%-60s %-20s %-20s %-20s %-20s %-20s\n", time.Now().String(), m.Type, pendingCount, p, requestID, sport)
+	time.Sleep(time.Millisecond * 200)
+	return
 	switch m.Type {
 	case uof.MessageTypeConnection:
 		fmt.Printf("%-25s status: %s, server: %s, local: %s, network: %s, tls: %s\n", m.Type, m.Connection.Status, m.Connection.ServerName, m.Connection.LocalAddr, m.Connection.Network, m.Connection.TLSVersionToString())
@@ -105,8 +119,19 @@ func logMessage(m *uof.Message) {
 		if m.Alive.Subscribed != 0 {
 			fmt.Printf("%-25s producer: %s, timestamp: %d\n", m.Type, m.Alive.Producer, m.Alive.Timestamp)
 		}
+	case uof.MessageTypeBetSettlement:
+		for _, v := range m.BetSettlement.Markets {
+			fmt.Printf("BET SETTLEMENT producer=%v eventID=%d marketID=%v status=%v\n", m.Producer, m.BetSettlement.EventURN.ID(), v.ID, v.Result)
+		}
+	case uof.MessageTypeBetStop:
+		for _, v := range m.BetStop.MarketIDs {
+			fmt.Printf("BET STOP producer=%v eventID=%d marketID=%v status=%v\n", m.Producer, m.BetStop.EventURN.ID(), v, m.BetStop.Status)
+		}
 	case uof.MessageTypeOddsChange:
-		fmt.Printf("%-25s event: %s, markets: %d\n", m.Type, m.EventURN, len(m.OddsChange.Markets))
+		fmt.Printf("ODDS CHANGE producer=%v eventID=%d eventStatus=%v\n", m.Producer, m.OddsChange.EventURN.ID(), m.OddsChange.EventStatus)
+		for _, v := range m.OddsChange.Markets {
+			fmt.Printf("ODDS CHANGE producer=%v eventID=%d marketID=%v status=%v\n", m.Producer, m.OddsChange.EventURN.ID(), v.ID, v.Status)
+		}
 	default:
 		var b []byte
 		if false && m.Raw != nil {

cmd/replay/main.go

@@ -12,15 +12,10 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 
-	"github.com/minus5/go-uof-sdk"
-	"github.com/minus5/go-uof-sdk/api"
-	"github.com/minus5/go-uof-sdk/pipe"
-	"github.com/minus5/go-uof-sdk/sdk"
-)
-
-const (
-	EnvBookmakerID = "UOF_BOOKMAKER_ID"
-	EnvToken       = "UOF_TOKEN"
+	"github.com/pvotal-tech/go-uof-sdk"
+	"github.com/pvotal-tech/go-uof-sdk/api"
+	"github.com/pvotal-tech/go-uof-sdk/pipe"
+	"github.com/pvotal-tech/go-uof-sdk/sdk"
 )
 
 func env(name string) string {
@@ -32,7 +27,7 @@ func env(name string) string {
 }
 
 var (
-	bookmakerID  string
+	bookmakerID  int
 	token        string
 	scenarioID   int
 	eventURN     uof.URN
@@ -56,9 +51,6 @@ func init() {
 		log.Printf("no event or scenario found, will replay sample event %s", event)
 	}
 	eventURN.Parse(event)
-
-	token = env(EnvToken)
-	bookmakerID = env(EnvBookmakerID)
 }
 
 func debugHTTP() {
@@ -84,7 +76,7 @@ func main() {
 	go debugHTTP()
 
 	err := sdk.Run(exitSignal(),
-		sdk.Credentials(bookmakerID, token),
+		sdk.Credentials(bookmakerID, token, 123),
 		sdk.Languages(uof.Languages("en,de,hr")),
 		sdk.BufferedConsumer(pipe.FileStore(outputFolder), 1024),
 		sdk.Callback(progress),