feat: add ToMap function in the Metric interface

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>

internal/plugin/diagnostic.go

@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"encoding/json"
 	"fmt"
 
 	cln4go "github.com/vincenzopalazzo/cln4go/plugin"
@@ -14,23 +13,11 @@ func NewRawLocalScoreRPC[T MetricsPluginState]() *RawLocalScoreRPC[T] {
 }
 
 func (instance *RawLocalScoreRPC[T]) Call(plugin *cln4go.Plugin[T], payload map[string]any) (map[string]any, error) {
-	metricOne, found := plugin.GetState().GetMetrics()[MetricOneID]
-	var result map[string]any
+	metric, found := plugin.GetState().GetMetrics()[RawLocalScoreID]
 	if !found {
 		return nil, fmt.Errorf("Metric with id %d not found", 1)
 	}
-
-	// FIXME: improve the metric API to include the ToMap call
-	resultStr, err := json.Marshal(metricOne)
-	if err != nil {
-		return nil, err
-	}
-
-	if err != json.Unmarshal(resultStr, &result) {
-		return nil, err
-	}
-
-	return result, nil
+	return metric.ToMap()
 }
 
 // ForceUpdateRPC enable the force update command

internal/plugin/metric_interface.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	MetricOneID int = 1
+	RawLocalScoreID int = 1
 )
 
 // MetricsSupported mapping the internal id with the name of the metrics.
@@ -54,6 +54,9 @@ type Metric interface {
 	// UpdateWithMsg update the metric with the last information fo the node with some msg info
 	UpdateWithMsg(message *Msg, lightning client.Client) error
 
+	// ToMap convert the Metric object into a map
+	ToMap() (map[string]any, error)
+
 	// ToJSON convert the object into a json
 	ToJSON() (string, error)
 

internal/plugin/metrics_one.go

@@ -299,6 +299,20 @@ func (instance *MetricOne) OnStop(msg *Msg, lightning cln4go.Client) error {
 	return nil
 }
 
+// ToMap encode the object into a map
+func (self *MetricOne) ToMap() (map[string]any, error) {
+	var result map[string]any
+	bytes, err := self.Encoder.EncodeToByte(self)
+	if err != nil {
+		return nil, err
+	}
+
+	if err != self.Encoder.DecodeFromBytes(bytes, &result) {
+		return nil, err
+	}
+	return result, nil
+}
+
 // ToJSON Convert the MetricOne structure to a JSON string.
 func (instance *MetricOne) ToJSON() (string, error) {
 	json, err := instance.Encoder.EncodeToByte(&instance)