Merge pull request #429 from marle3003/v0.11

V0.11

Author: marle3003

.idea/workspace.xml

@@ -36,28 +36,39 @@ Its core feature are:
 - **Multiple Provider support**: File, HTTP, GIT, NPM to gather configurations and scripts.
 - **Dashboard** to see what's going on.
 
- 
-<p align="center">
-<a href="https://www.buymeacoffee.com/mokapi" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
-<p align="center">
-
-## Example
-
-<img src="webui/public/everythingcode.png" alt="Mokapi Web UI" title="Mokapi Web UI" />
+## Usage
 
-## Web UI
+Windows
+```shell
+chcco install mokapi
+mokapi --providers-http-url https://petstore31.swagger.io/api/v31/openapi.json
+```
 
-<img src="webui.png" alt="Mokapi Web UI" title="Mokapi Web UI" />
+MacOS
+```shell
+brew tap marle3003/tap 
+brew install mokapi
+mokapi --providers-http-url https://petstore31.swagger.io/api/v31/openapi.json
+```
 
-## Usage
+Docker
+```shell
+docker run --env 'MOKAPI_Providers_Http_URL'='https://petstore31.swagger.io/api/v31/openapi.json' -p 80:80 -p 8080:8080 mokapi/mokapi:latest
+```
 
+Run a request
 ```shell
-docker run --env 'MOKAPI_Services_Swagger-Petstore_Config_Url'='https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/examples/v3.0/petstore.yaml' \
-  --env 'MOKAPI_Services_Swagger-Petstore_Http_Servers[0]_Url'='http://:80' \
-  -p 80:80 -p 8080:8080 \
-  mokapi/mokapi:latest
+curl http://localhost/api/v31/pet/2 -H 'Accept: application/json'
 ```
 
+## Example
+
+<img src="webui/public/control-mock-api-everything.png" alt="Mokapi Web UI" title="Mokapi Web UI" />
+
+## Dashboard
+
+<img src="webui.png" alt="Mokapi Web UI" title="Mokapi Web UI" />
+
 ## Documentation
 
 - [Get Started](https://mokapi.io/docs/guides/get-started/welcome)
@@ -68,3 +79,8 @@ docker run --env 'MOKAPI_Services_Swagger-Petstore_Config_Url'='https://raw.gith
 - [Javascript API](https://mokapi.io/docs/javascript-api)
 - [Examples & Tutorials](https://mokapi.io/docs/examples)
 - [Blogs](https://mokapi.io/docs/blogs)
+
+&nbsp;
+<p align="center">
+<a href="https://www.buymeacoffee.com/mokapi" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+<p align="center">

README.md

@@ -132,7 +132,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		if isAsset(r.URL.Path) {
 			r.URL.Path = "/assets/" + filepath.Base(r.URL.Path)
-		} else if filepath.Ext(r.URL.Path) == ".svg" || filepath.Ext(r.URL.Path) == ".png" {
+		} else if isImage(r.URL.Path) {
 			// don't change url
 		} else {
 			if len(h.path) > 0 || len(h.base) > 0 {
@@ -213,3 +213,13 @@ func writeJsonBody(w http.ResponseWriter, i interface{}) {
 func isAsset(path string) bool {
 	return strings.Contains(path, "/assets/")
 }
+
+func isImage(path string) bool {
+	str := filepath.Ext(path)
+	switch str {
+	case ".jpg", ".jpeg", ".png", ".svg":
+		return true
+	default:
+		return false
+	}
+}

api/handler.go

@@ -37,11 +37,6 @@ func TestHandler_FileServer(t *testing.T) {
 					try.HasHeader("Content-Type", "application/json"),
 					try.HasBody(`{"version":"","buildTime":""}`))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/index.html" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 		{
 			name:   "request web app",
@@ -55,11 +50,6 @@ func TestHandler_FileServer(t *testing.T) {
 					h,
 					try.HasStatusCode(200))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/index.html" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 		{
 			name:   "request web app",
@@ -73,11 +63,6 @@ func TestHandler_FileServer(t *testing.T) {
 					h,
 					try.HasStatusCode(200), try.BodyContains(`<base href="/mokapi/dashboard/" />`))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/index.html" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 		{
 			name:   "request asset",
@@ -97,11 +82,6 @@ func TestHandler_FileServer(t *testing.T) {
 					h,
 					try.HasStatusCode(200))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/assets/index.js" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 		{
 			name:   "request svg",
@@ -115,11 +95,6 @@ func TestHandler_FileServer(t *testing.T) {
 					h,
 					try.HasStatusCode(200))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/logo.svg" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 		{
 			name:   "request png",
@@ -133,11 +108,19 @@ func TestHandler_FileServer(t *testing.T) {
 					h,
 					try.HasStatusCode(200))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/mail.png" {
-					writer.WriteHeader(404)
-				}
-			}),
+		},
+		{
+			name:   "request jpg",
+			config: static.Api{Path: "/mokapi/dashboard", Dashboard: true},
+			fn: func(t *testing.T, h http.Handler) {
+				try.Handler(t,
+					http.MethodGet,
+					"http://foo.api/mokapi/dashboard/petstore-rest-api-endpoints.jpg",
+					nil,
+					"",
+					h,
+					try.HasStatusCode(200))
+			},
 		},
 		{
 			name:   "url rewrite (proxy)",
@@ -152,11 +135,6 @@ func TestHandler_FileServer(t *testing.T) {
 					try.HasStatusCode(200),
 					try.BodyContains(`<base href="/foo/mokapi/dashboard/" />`))
 			},
-			fileServer: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-				if request.URL.Path != "/index.html" {
-					writer.WriteHeader(404)
-				}
-			}),
 		},
 	}
 

api/handler_fileserver_test.go

@@ -12,7 +12,7 @@ import (
 	schematest2 "mokapi/providers/openapi/schema/schematest"
 	"mokapi/runtime"
 	"mokapi/runtime/monitor"
-	"mokapi/schema/json/schematest"
+	"mokapi/schema/json/schema/schematest"
 	"mokapi/try"
 	"net/http"
 	"testing"

api/handler_kafka_test.go

@@ -74,9 +74,9 @@ func (h *handler) getExampleData(w http.ResponseWriter, r *http.Request) {
 	case *schema.Ref:
 		data, err = getRandomByOpenApi(re.Name, s, ct)
 	case *avro.Schema:
-		data, err = getRandomByJson(re.Name, &jsonSchema.Ref{Value: s.Convert()}, ct)
+		data, err = getRandomByJson(re.Name, s.Convert(), ct)
 	default:
-		data, err = getRandomByJson(re.Name, s.(*jsonSchema.Ref), ct)
+		data, err = getRandomByJson(re.Name, s.(*jsonSchema.Schema), ct)
 	}
 
 	if err != nil {
@@ -103,7 +103,7 @@ func getRandomByOpenApi(name string, r *schema.Ref, ct media.ContentType) ([]byt
 	return r.Marshal(data, ct)
 }
 
-func getRandomByJson(name string, r *jsonSchema.Ref, ct media.ContentType) ([]byte, error) {
+func getRandomByJson(name string, r *jsonSchema.Schema, ct media.ContentType) ([]byte, error) {
 	data, err := generator.New(&generator.Request{
 		Path: generator.Path{
 			&generator.PathElement{Name: name, Schema: r},
@@ -215,7 +215,7 @@ func unmarshal(raw json.RawMessage, format string) (interface{}, error) {
 			err := json.Unmarshal(raw, &a)
 			return a, err
 		default:
-			var r *jsonSchema.Ref
+			var r *jsonSchema.Schema
 			err := json.Unmarshal(raw, &r)
 			return r, err
 		}

api/handler_schema.go

@@ -8,7 +8,6 @@ import (
 	"mokapi/runtime"
 	"mokapi/runtime/monitor"
 	avro "mokapi/schema/avro/schema"
-	"mokapi/schema/json/ref"
 	jsonSchema "mokapi/schema/json/schema"
 	"mokapi/try"
 	"net/http"
@@ -260,8 +259,8 @@ func TestSchemaInfo_UnmarshalJSON(t *testing.T) {
 			test: func(t *testing.T, s *schemaInfo, err error) {
 				require.NoError(t, err)
 				require.NotNil(t, s.Schema)
-				require.IsType(t, &jsonSchema.Ref{}, s.Schema)
-				require.Equal(t, "object", s.Schema.(*jsonSchema.Ref).Value.Type[0])
+				require.IsType(t, &jsonSchema.Schema{}, s.Schema)
+				require.Equal(t, "object", s.Schema.(*jsonSchema.Schema).Type[0])
 			},
 		},
 		{
@@ -271,8 +270,8 @@ func TestSchemaInfo_UnmarshalJSON(t *testing.T) {
 				require.NoError(t, err)
 				require.Equal(t, "foo", s.Format)
 				require.NotNil(t, s.Schema)
-				require.IsType(t, &jsonSchema.Ref{}, s.Schema)
-				require.Equal(t, "object", s.Schema.(*jsonSchema.Ref).Value.Type[0])
+				require.IsType(t, &jsonSchema.Schema{}, s.Schema)
+				require.Equal(t, "object", s.Schema.(*jsonSchema.Schema).Type[0])
 			},
 		},
 	}
@@ -314,21 +313,21 @@ func TestSchemaInfo_MarshalJSON(t *testing.T) {
 		},
 		{
 			name: "json schema only ref",
-			s:    &schemaInfo{Schema: &jsonSchema.Ref{Reference: ref.Reference{Ref: "foo/bar"}}},
+			s:    &schemaInfo{Schema: &jsonSchema.Schema{Ref: "foo/bar"}},
 			test: func(t *testing.T, s string, err error) {
 				require.NoError(t, err)
-				require.Equal(t, `{"schema":{"ref":"foo/bar"}}`, s)
+				require.Equal(t, `{"schema":{"$ref":"foo/bar"}}`, s)
 			},
 		},
 		{
 			name: "json schema ref and value",
-			s: &schemaInfo{Schema: &jsonSchema.Ref{
-				Reference: ref.Reference{Ref: "foo/bar"},
-				Value:     &jsonSchema.Schema{Type: jsonSchema.Types{"string"}},
+			s: &schemaInfo{Schema: &jsonSchema.Schema{
+				Ref:  "foo/bar",
+				Type: jsonSchema.Types{"string"},
 			}},
 			test: func(t *testing.T, s string, err error) {
 				require.NoError(t, err)
-				require.Equal(t, `{"schema":{"ref":"foo/bar","type":"string"}}`, s)
+				require.Equal(t, `{"schema":{"$ref":"foo/bar","type":"string"}}`, s)
 			},
 		},
 		{

api/handler_schema_test.go

@@ -36,7 +36,7 @@ func (h *handler) validate(w http.ResponseWriter, r *http.Request) {
 	case *schema.Ref:
 		err = parseByOpenApi([]byte(valReq.Data), s, ct)
 	default:
-		err = parseByJson([]byte(valReq.Data), s.(*jsonSchema.Ref), ct)
+		err = parseByJson([]byte(valReq.Data), s.(*jsonSchema.Schema), ct)
 	}
 
 	if err != nil {
@@ -94,7 +94,7 @@ func parseByOpenApi(data []byte, s *schema.Ref, ct media.ContentType) error {
 	return err
 }
 
-func parseByJson(data []byte, s *jsonSchema.Ref, ct media.ContentType) error {
+func parseByJson(data []byte, s *jsonSchema.Schema, ct media.ContentType) error {
 	v, err := encoding.Decode(data, encoding.WithContentType(ct))
 	if err != nil {
 		return err

api/handler_schema_validate.go

@@ -72,7 +72,7 @@ func WithSchemas(name string, s *schema.Schema) ConfigOptions {
 			c.Components.Schemas = map[string]*asyncapi3.SchemaRef{}
 		}
 		c.Components.Schemas[name] = &asyncapi3.SchemaRef{
-			Value: &asyncapi3.MultiSchemaFormat{Schema: &schema.Ref{Value: s}},
+			Value: &asyncapi3.MultiSchemaFormat{Schema: s},
 		}
 	}
 }

config/dynamic/asyncApi/asyncapitest/config.go

@@ -18,7 +18,7 @@ func NewMessage(opts ...MessageOptions) *asyncApi.Message {
 
 func WithPayload(s *schema.Schema) MessageOptions {
 	return func(m *asyncApi.Message) {
-		m.Payload = &asyncapi3.SchemaRef{Value: &asyncapi3.MultiSchemaFormat{Schema: &schema.Ref{Value: s}}}
+		m.Payload = &asyncapi3.SchemaRef{Value: &asyncapi3.MultiSchemaFormat{Schema: s}}
 	}
 }
 
@@ -30,7 +30,7 @@ func WithContentType(s string) MessageOptions {
 
 func WithKey(s *schema.Schema) MessageOptions {
 	return func(m *asyncApi.Message) {
-		m.Bindings.Kafka.Key = &asyncapi3.SchemaRef{Value: &asyncapi3.MultiSchemaFormat{Schema: &schema.Ref{Value: s}}}
+		m.Bindings.Kafka.Key = &asyncapi3.SchemaRef{Value: &asyncapi3.MultiSchemaFormat{Schema: s}}
 	}
 }