feat: updated spec with more network context; updated edge routing logic; added additional supported headers; retry for nats

Author: Dimy Jeannot

go/oeco-sdk/v2beta/CHANGELOG.md

@@ -2,11 +2,11 @@
 
 ### 🩹 Fixes
 
-- added additional error handling; preparing for batch handling ([0fa903f](https://github.com/openecosystems/ecosystem/commit/0fa903f))
+-   added additional error handling; preparing for batch handling ([0fa903f](https://github.com/openecosystems/ecosystem/commit/0fa903f))
 
 ### ❤️ Thank You
 
-- Dimy Jeannot
+-   Dimy Jeannot
 
 ## 0.20.4 (2025-09-21)
 

go/oeco-sdk/v2beta/bindings/nats/binding.go

@@ -140,19 +140,27 @@ func (b *Binding) Bind(_ context.Context, bindings *sdkv2betalib.Bindings) *sdkv
 						apexlog.Info("Connection closed.")
 					}))
 
-					_nats, err := nats.Connect(servers, natsOptions...)
+					maxRetries := 180              // -1 for infinite retries
+					retryDelay := 10 * time.Second // wait 3 seconds between attempts
+
+					_nats, js, err := connectWithRetry(servers, maxRetries, retryDelay, natsOptions...)
 					if err != nil {
-						fmt.Println(err.Error())
-						panic("Cannot connect to NATS")
+						panic(err)
 					}
+
+					//_nats, err := nats.Connect(servers, natsOptions...)
+					//if err != nil {
+					//	fmt.Println(err.Error())
+					//	panic("Cannot connect to NATS")
+					//}
 					b.Nats = _nats
 
 					// Create a JetStream management interface
-					js, err := jetstream.New(_nats)
-					if err != nil {
-						fmt.Println(err.Error())
-						panic("Cannot configure Jetstream")
-					}
+					//js, err := jetstream.New(_nats)
+					//if err != nil {
+					//	fmt.Println(err.Error())
+					//	panic("Cannot configure Jetstream")
+					//}
 					b.JetStream = &js
 
 					Bound = &Binding{
@@ -261,3 +269,33 @@ func (b *Binding) RegisterSpecBatchListeners(bindings *sdkv2betalib.Bindings) *s
 
 	return bindings
 }
+
+func connectWithRetry(url string, maxRetries int, retryDelay time.Duration, options ...nats.Option) (*nats.Conn, jetstream.JetStream, error) {
+	var nc *nats.Conn
+	var js jetstream.JetStream
+	var err error
+
+	for attempt := 1; maxRetries == -1 || attempt <= maxRetries; attempt++ {
+		fmt.Printf("Connecting to NATS (attempt %d)...\n", attempt)
+
+		nc, err = nats.Connect(url)
+		if err != nil {
+			fmt.Printf("NATS connection failed: %v\n", err)
+			time.Sleep(retryDelay)
+			continue
+		}
+
+		js, err = jetstream.New(nc)
+		if err != nil {
+			fmt.Printf("JetStream setup failed: %v\n", err)
+			nc.Close()
+			time.Sleep(retryDelay)
+			continue
+		}
+
+		fmt.Println("Connected to NATS and JetStream is ready.")
+		return nc, js, nil
+	}
+
+	return nil, nil, fmt.Errorf("failed to connect to NATS after %d attempts", maxRetries)
+}

go/oeco-sdk/v2beta/edge.go

@@ -123,36 +123,65 @@ var allowedRequestHeaders = map[string]struct{}{
 	AccessControlMaxAge:             {},
 	AccessControlRequestHeaders:     {},
 	AccessControlRequestMethod:      {},
-	XCorrelationId:                  {},
-	XClientTraceId:                  {},
-	XB3Traceid:                      {},
-	XB3Spanid:                       {},
-	XB3Parentspanid:                 {},
-	XB3Sampled:                      {},
-	XB3Flags:                        {},
-	ApiKey:                          {},
-	XSpecRouterKey:                  {},
-	XSpecEnvironment:                {},
-	XSpecPlatformHost:               {},
-	FieldMask:                       {},
-	SentAtKey:                       {},
-	LocaleKey:                       {},
-	TimezoneKey:                     {},
-	ValidateOnlyKey:                 {},
-	DeviceIdKey:                     {},
-	DeviceAdvertisingIdKey:          {},
-	DeviceManufacturerKey:           {},
-	DeviceModelKey:                  {},
-	DeviceNameKey:                   {},
-	DeviceTypeKey:                   {},
-	DeviceTokenKey:                  {},
-	BluetoothKey:                    {},
-	CellularKey:                     {},
-	WifiKey:                         {},
-	CarrierKey:                      {},
-	OsNameKey:                       {},
-	OsVersionKey:                    {},
-	EcosystemID:                     {},
+	XForwardedFor:                   {},
+
+	XSpecRouterKey:    {},
+	XSpecEnvironment:  {},
+	XSpecPlatformHost: {},
+
+	RequestIdKey:    {},
+	XCorrelationId:  {},
+	XClientTraceId:  {},
+	XB3Traceid:      {},
+	XB3Spanid:       {},
+	XB3Parentspanid: {},
+	XB3Sampled:      {},
+	XB3Flags:        {},
+
+	ApiKey:          {},
+	FieldMask:       {},
+	ValidateOnlyKey: {},
+
+	SentAtKey:   {},
+	LocaleKey:   {},
+	TimezoneKey: {},
+	IpKey:       {},
+
+	OrganizationID:             {},
+	OrganizationSlug:           {},
+	EcosystemID:                {},
+	EcosystemSlug:              {},
+	JurisdictionAreaNetworkKey: {},
+
+	ContinentKey:   {},
+	CountryKey:     {},
+	IsEUCountryKey: {},
+	CityKey:        {},
+	RegionKey:      {},
+	RegionCodeKey:  {},
+	LatitudeKey:    {},
+	LongitudeKey:   {},
+	PostalCodeKey:  {},
+	MetroCodeKey:   {},
+	SpeedKey:       {},
+
+	DeviceIdKey:            {},
+	DeviceAdvertisingIdKey: {},
+	DeviceManufacturerKey:  {},
+	DeviceModelKey:         {},
+	DeviceNameKey:          {},
+	DeviceTypeKey:          {},
+	DeviceTokenKey:         {},
+
+	BluetoothKey:       {},
+	CellularKey:        {},
+	WifiKey:            {},
+	CarrierKey:         {},
+	AsnKey:             {},
+	AsnOrganizationKey: {},
+
+	OsNameKey:    {},
+	OsVersionKey: {},
 }
 
 func sanitizeRequestHeaders(req *http.Request) {

go/oeco-sdk/v2beta/error.go

@@ -267,8 +267,11 @@ func (se *SpecError) WithSpecDetail(spec *specv2pb.Spec) SpecErrorable {
 		return se
 	}
 
-	se.ConnectErr.AddDetail(d)
-	return se
+	newErr := *se // shallow copy
+	newErr.ConnectErr = *connect.NewError(se.ConnectErr.Code(), se.ConnectErr.Unwrap())
+	newErr.ConnectErr.AddDetail(d)
+	// se.ConnectErr.AddDetail(d)
+	return &newErr
 }
 
 // WithInternalErrorDetail sets internal error details for the SpecError instance and returns the updated SpecError object.