Develop (#210)

* issues #64 technical debt
* fix script binds
* update sun and moon plugins
* update weather met
* update weather owm

api/api.go

@@ -37,7 +37,6 @@ import (
 
 	"github.com/e154/smart-home/api/controllers"
 	gw "github.com/e154/smart-home/api/stub/api"
-	"github.com/e154/smart-home/common"
 	"github.com/e154/smart-home/common/logger"
 	"github.com/e154/smart-home/system/rbac"
 )
@@ -213,7 +212,13 @@ func (a *Api) Start() (err error) {
 		r.URL, _ = r.URL.Parse(r.RequestURI)
 		fileServer.ServeHTTP(w, r)
 	})
-	httpv1.Handle("/api_static", http.FileServer(http.Dir(common.StoragePath())))
+	//httpv1.Handle("/api_static", http.FileServer(http.Dir(common.StoragePath())))
+	fileServer2 := http.FileServer(http.Dir("./data/static"))
+	httpv1.HandleFunc("/static/", func(w http.ResponseWriter, r *http.Request) {
+		r.RequestURI = strings.ReplaceAll(r.RequestURI, "/static/", "/")
+		r.URL, _ = r.URL.Parse(r.RequestURI)
+		fileServer2.ServeHTTP(w, r)
+	})
 
 	// swagger
 	if a.cfg.Swagger {

api/api.swagger.json

@@ -5089,6 +5089,16 @@
           "items": {
             "$ref": "#/definitions/apiAttribute"
           }
+        },
+        "map": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/apiAttribute"
+          }
+        },
+        "time": {
+          "type": "string",
+          "format": "date-time"
         }
       }
     },
@@ -7019,7 +7029,9 @@
         "STRING",
         "FLOAT",
         "BOOL",
-        "ARRAY"
+        "ARRAY",
+        "MAP",
+        "TIME"
       ],
       "default": "INT"
     },

api/dto/attributes.go

@@ -22,10 +22,15 @@ import (
 	"github.com/e154/smart-home/api/stub/api"
 	"github.com/e154/smart-home/common"
 	m "github.com/e154/smart-home/models"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 // AttributeFromApi ...
 func AttributeFromApi(apiAttr map[string]*api.Attribute) (attributes m.Attributes) {
+	return attributeFromApi(apiAttr)
+}
+
+func attributeFromApi(apiAttr map[string]*api.Attribute) (attributes m.Attributes) {
 	attributes = make(m.Attributes)
 	for k, v := range apiAttr {
 		attr := &m.Attribute{
@@ -47,6 +52,12 @@ func AttributeFromApi(apiAttr map[string]*api.Attribute) (attributes m.Attribute
 		case api.Types_ARRAY:
 			//	attr.Value = v.GetArray()
 			attr.Type = common.AttributeArray
+		case api.Types_MAP:
+			attr.Type = common.AttributeMap
+			attr.Value = AttributeFromApi(v.GetMap())
+		case api.Types_TIME:
+			attr.Value = v.GetTime().AsTime()
+			attr.Type = common.AttributeTime
 		}
 		attributes[k] = attr
 	}
@@ -75,6 +86,11 @@ func AttributeToApi(attributes m.Attributes) (apiAttr map[string]*api.Attribute)
 			apiAttr[k].Float = common.Float32(float32(v.Float64()))
 		case "array":
 			apiAttr[k].Type = api.Types_ARRAY
+		case "map":
+			apiAttr[k].Type = api.Types_MAP
+		case "time":
+			apiAttr[k].Type = api.Types_TIME
+			apiAttr[k].Time = timestamppb.New(v.Time())
 		}
 	}
 	return

api/protos/attributes.proto

@@ -4,12 +4,16 @@ package api;
 
 option go_package = "/api";
 
+import "google/protobuf/timestamp.proto";
+
 enum Types {
   INT = 0;
   STRING = 1;
   FLOAT = 2;
   BOOL = 3;
   ARRAY = 4;
+  MAP = 5;
+  TIME = 6;
 }
 
 message Attribute {
@@ -20,4 +24,6 @@ message Attribute {
   optional bool bool = 5;
   optional float float = 6;
   repeated Attribute array = 7;
+  map<string, Attribute> map = 8;
+  optional google.protobuf.Timestamp time = 9;
 }