|
|
@@ -45,7 +45,7 @@ func NewClientBusHttp(urlRemote defs.ITxtFix) bus_spec.IBusClient {
|
|
|
}
|
|
|
log := mL1.NewLogBuf(param)
|
|
|
log.Debug(defs.TxtFix("NewClientBusHttp()"))
|
|
|
- helpers.Hassert(urlRemote != nil, "NewClientBusHttp(): urlRemote is empty", []any{})
|
|
|
+ helpers.If(urlRemote == nil).Hassert("NewClientBusHttp(): urlRemote is empty", []any{})
|
|
|
kCtx := kctx.GetKernelCtx()
|
|
|
resLocal := safe_string.NewSafeStringGetenv(
|
|
|
defs.TxtFix("LOCAL_HTTP_URL"))
|
|
|
@@ -66,7 +66,7 @@ func NewClientBusHttp(urlRemote defs.ITxtFix) bus_spec.IBusClient {
|
|
|
// Unsubscribe -- отписывается от топика в дистанционной шине.
|
|
|
func (sf *ClientBusHttp) Unsubscribe(handler bus_spec.IBusHandlerSubscribe) {
|
|
|
_uuid, err := uuid.NewV6()
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.Unsubscribe(): in generate UUID v6, err=\n\t%v", err)
|
|
|
+ helpers.If(err != nil).Hassert("ClientBusHttp.Unsubscribe(): in generate UUID v6, err=\n\t%v", err)
|
|
|
|
|
|
req := &dot.UnsubReq{
|
|
|
HandlerName_: handler.Name().Get(),
|
|
|
@@ -74,12 +74,13 @@ func (sf *ClientBusHttp) Unsubscribe(handler bus_spec.IBusHandlerSubscribe) {
|
|
|
}
|
|
|
req.SelfCheck()
|
|
|
binReq, err := json.MarshalIndent(req, "", " ")
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil,
|
|
|
- "ClientBusHttp.Unsubscribe(): in marshal to JSON unsubscribe request, err=\n\t%v", err)
|
|
|
+ helpers.If(err != nil).Hassert("ClientBusHttp.Unsubscribe(): in marshal to JSON unsubscribe request, err=\n\t%v",
|
|
|
+ err)
|
|
|
reader := strings.NewReader(string(binReq))
|
|
|
|
|
|
hReq, err := http.NewRequest(http.MethodPost, sf.urlRemote.String()+"/bus/unsub", reader)
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.Unsubscribe(): in new request, err=\n\t%v", err)
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.Unsubscribe(): in new request, err=\n\t%v", err)
|
|
|
|
|
|
resBody := sf.makePost(hReq)
|
|
|
if resBody.IsErr() {
|
|
|
@@ -105,7 +106,9 @@ func (sf *ClientBusHttp) Unsubscribe(handler bus_spec.IBusHandlerSubscribe) {
|
|
|
// Subscribe -- подписывается на топик в дистанционной шине.
|
|
|
func (sf *ClientBusHttp) Subscribe(handler bus_spec.IBusHandlerSubscribe) def_spec.IResult[mKs.EBool] {
|
|
|
_uuid, err := uuid.NewV6()
|
|
|
- helpers.Hassert(err == nil, "ClientBusHttp.Subscribe(): in generate UUID v6, err=\n\t%v", []any{err})
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.Subscribe(): in generate UUID v6, err=\n\t%v",
|
|
|
+ []any{err})
|
|
|
req := &dot.SubscribeReq{
|
|
|
Topic_: handler.Topic().Get(),
|
|
|
Uuid_: defs.TxtFix(_uuid.String()),
|
|
|
@@ -116,7 +119,9 @@ func (sf *ClientBusHttp) Subscribe(handler bus_spec.IBusHandlerSubscribe) def_sp
|
|
|
body := strings.NewReader(string(binReq))
|
|
|
endPoint := defs.TxtFix("%v%v", sf.urlLocal.String()+"/bus/sub")
|
|
|
hReq, err := http.NewRequest(http.MethodPost, endPoint.String(), body)
|
|
|
- helpers.Hassert(err != nil, "ClientBusHttp.Subscribe(): in new request, err=\n\t%v", []any{})
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.Subscribe(): in new request, err=\n\t%v",
|
|
|
+ []any{})
|
|
|
|
|
|
resBody := sf.makePost(hReq)
|
|
|
if resBody.IsErr() {
|
|
|
@@ -144,7 +149,9 @@ func (sf *ClientBusHttp) Subscribe(handler bus_spec.IBusHandlerSubscribe) def_sp
|
|
|
// SendRequest -- отправляет в дистанционную шину запрос.
|
|
|
func (sf *ClientBusHttp) SendRequest(topic bus_ent.ITopicFix, binReq []byte) mL0.IResult[[]byte] {
|
|
|
_uuid, err := uuid.NewV6()
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.SendRequest(): in generate UUID v6, err=\n\t%v", err)
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.SendRequest(): in generate UUID v6, err=\n\t%v",
|
|
|
+ err)
|
|
|
req := &dot.ServeReq{
|
|
|
Topic_: topic.Get(),
|
|
|
Uuid_: defs.TxtFix(_uuid.String()),
|
|
|
@@ -155,7 +162,9 @@ func (sf *ClientBusHttp) SendRequest(topic bus_ent.ITopicFix, binReq []byte) mL0
|
|
|
body := strings.NewReader(string(_binReq))
|
|
|
endPont := defs.TxtFix("%v%v", sf.urlRemote.String(), "/bus/request")
|
|
|
hReq, err := http.NewRequest(http.MethodPost, endPont.String(), body)
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.SendRequest(): in new request, err=\n\t%v")
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.SendRequest(): in new request, err=\n\t%v",
|
|
|
+ err)
|
|
|
|
|
|
resBody := sf.makePost(hReq)
|
|
|
if resBody.IsErr() {
|
|
|
@@ -196,7 +205,9 @@ func (sf *ClientBusHttp) RegisterServe(handler bus_spec.IBusHandlerServe) mL0.IR
|
|
|
// Publish -- публикует сообщение в дистанционной шину.
|
|
|
func (sf *ClientBusHttp) Publish(topic bus_ent.ITopicFix, binMsg []byte) mL0.IResult[mKs.EBool] {
|
|
|
_uuid, err := uuid.NewV6()
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.Publish(): in generate UUID v6, err=\n\t%v", err)
|
|
|
+ helpers.If(err != nil).
|
|
|
+ Hassert("ClientBusHttp.Publish(): in generate UUID v6, err=\n\t%v",
|
|
|
+ err)
|
|
|
req := &dot.PublishReq{
|
|
|
Topic_: topic.Get(),
|
|
|
Uuid_: defs.TxtFix(_uuid.String()),
|
|
|
@@ -207,7 +218,7 @@ func (sf *ClientBusHttp) Publish(topic bus_ent.ITopicFix, binMsg []byte) mL0.IRe
|
|
|
body := strings.NewReader(string(binReq))
|
|
|
endPoint := defs.TxtFix("%v%v", sf.urlRemote.Get(), "/bus/pub")
|
|
|
hReq, err := http.NewRequest(http.MethodPost, endPoint.String(), body)
|
|
|
- mL1.FnHassert(helpers.Hassert)(err == nil, "ClientBusHttp.Publish(): in new request, err=\n\t%v")
|
|
|
+ helpers.If(err != nil).Hassert("ClientBusHttp.Publish(): in new request, err=\n\t%v")
|
|
|
|
|
|
resBody := sf.makePost(hReq)
|
|
|
if resBody.IsErr() {
|