diff --git a/daemons/node/common/common_stream.go b/daemons/node/common/common_stream.go index 6cc6f1e..259f624 100644 --- a/daemons/node/common/common_stream.go +++ b/daemons/node/common/common_stream.go @@ -68,7 +68,7 @@ func (ix *LongLivedStreamRecordedService[T]) gc() { } ix.PubsubMu.Lock() if ix.LongLivedPubSubs[TopicPubSubNodeActivity] != nil { - ad, err := pp.AddrInfoFromString("/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + " /p2p/" + ix.Host.ID().String()) + ad, err := pp.AddrInfoFromString("/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + "/p2p/" + ix.Host.ID().String()) if err == nil { if b, err := json.Marshal(TopicNodeActivityPub{ Disposer: *ad, diff --git a/daemons/node/indexer/handler.go b/daemons/node/indexer/handler.go index bedd573..e4e2e11 100644 --- a/daemons/node/indexer/handler.go +++ b/daemons/node/indexer/handler.go @@ -79,7 +79,6 @@ func (pr *PeerRecord) ExtractPeer(ourkey string, key string, pubKey crypto.PubKe if err != nil { return false, nil, err } - fmt.Println("ExtractPeer MarshalPublicKey") rel := pp.NONE if ourkey == key { // at this point is PeerID is same as our... we are... thats our peer INFO rel = pp.SELF @@ -106,7 +105,8 @@ func (pr *PeerRecord) ExtractPeer(ourkey string, key string, pubKey crypto.PubKe if err != nil { return pp.SELF == p.Relation, nil, err } - go tools.NewNATSCaller().SetNATSPub(tools.CREATE_RESOURCE, tools.NATSResponse{ + fmt.Println("SENDPEER SELF") + go tools.NewNATSCaller().SetNATSPub(tools.CREATE_PEER, tools.NATSResponse{ FromApp: "oc-discovery", Datatype: tools.PEER, Method: int(tools.CREATE_PEER), @@ -183,7 +183,7 @@ func (ix *IndexerService) handleNodePublish(s network.Stream) { } if ix.LongLivedPubSubs[common.TopicPubSubNodeActivity] != nil && !rec.NoPub { - ad, err := peer.AddrInfoFromString("/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + " /p2p/" + ix.Host.ID().String()) + ad, err := peer.AddrInfoFromString("/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + "/p2p/" + ix.Host.ID().String()) if err == nil { if b, err := json.Marshal(common.TopicNodeActivityPub{ Disposer: *ad, diff --git a/daemons/node/node.go b/daemons/node/node.go index 8fadd0e..c4adf0f 100644 --- a/daemons/node/node.go +++ b/daemons/node/node.go @@ -237,7 +237,7 @@ func (d *Node) claimInfo( } rec.APIUrl = endPoint - rec.StreamAddress = "/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + " /p2p/" + rec.PeerID + rec.StreamAddress = "/ip4/" + conf.GetConfig().Hostname + " /tcp/" + fmt.Sprintf("%v", conf.GetConfig().NodeEndpointPort) + "/p2p/" + rec.PeerID rec.NATSAddress = oclib.GetConfig().NATSUrl rec.WalletAddress = "my-wallet" rec.ExpiryDate = expiry diff --git a/go.mod b/go.mod index 8b30014..3bd8cd0 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module oc-discovery go 1.24.6 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 + cloud.o-forge.io/core/oc-lib v0.0.0-20260205131630-342451db2581 github.com/beego/beego v1.12.13 github.com/beego/beego/v2 v2.3.8 github.com/go-redis/redis v6.15.9+incompatible diff --git a/go.sum b/go.sum index e0ebd96..0d96cf0 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,10 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260203150123-4258f6b58083 h1:nKiU4AfeX+axS cloud.o-forge.io/core/oc-lib v0.0.0-20260203150123-4258f6b58083/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 h1:ZDRvnzTTNHgMm5hYmseHdEPqQ6rn/4v+P9f/JIxPaNw= cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= +cloud.o-forge.io/core/oc-lib v0.0.0-20260205131048-425cd2a9ba2f h1:Ku6u+SeoNXHMBzckekGyXCHLDJPh20Y8GayO6fXEcZE= +cloud.o-forge.io/core/oc-lib v0.0.0-20260205131048-425cd2a9ba2f/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= +cloud.o-forge.io/core/oc-lib v0.0.0-20260205131630-342451db2581 h1:V9eANWFEkoEPg3nWCvYXnLYbKDdAm3/Y7uCw1nt22Cc= +cloud.o-forge.io/core/oc-lib v0.0.0-20260205131630-342451db2581/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/main.go b/main.go index 7a75de3..201b4a0 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ func main() { oclib.InitDaemon(appname) // get the right config file - o := oclib.GetConfLoader() + o := oclib.GetConfLoader(appname) conf.GetConfig().Name = o.GetStringDefault("NAME", "opencloud-demo") conf.GetConfig().Hostname = o.GetStringDefault("HOSTNAME", "127.0.0.1")