From 364481d3f31e391def9e0ca6c17147f5d8b63ca3 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <xdrm.brackets.dev@gmail.com>
Date: Fri, 1 Jun 2018 11:07:34 +0200
Subject: [PATCH] implementable controller working + HTTP response writing

---
 implement/types.go |  3 ++-
 request/request.go |  8 ++++----
 router.go          | 24 ++++++++++++++++--------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/implement/types.go b/implement/types.go
index 26c6192..8cc4ffa 100644
--- a/implement/types.go
+++ b/implement/types.go
@@ -5,7 +5,8 @@ import (
 	"sync"
 )
 
-type Controller func(map[string]interface{}) *Response
+type Arguments map[string]interface{}
+type Controller func(map[string]interface{}, *Response) Response
 
 type Response struct {
 	data map[string]interface{}
diff --git a/request/request.go b/request/request.go
index afbc863..7ac9024 100644
--- a/request/request.go
+++ b/request/request.go
@@ -93,10 +93,10 @@ func FetchFormData(req *http.Request) map[string]interface{} {
 
 // LoadController tries to load a controller from its uri
 // checks for its given method ('Get', 'Post', 'Put', or 'Delete')
-func (i *Request) LoadController(method string) (implement.Controller, error) {
+func (i *Request) LoadController(method string) (func(implement.Arguments, *implement.Response) implement.Response, error) {
 
 	/* (1) Build controller path */
-	path := fmt.Sprintf("%si.so", i.Path)
+	path := fmt.Sprintf("./controllers/%si.so", strings.Join(i.Path, "/"))
 
 	/* (2) Format url */
 	tmp := []byte(strings.ToLower(method))
@@ -104,7 +104,6 @@ func (i *Request) LoadController(method string) (implement.Controller, error) {
 	method = string(tmp)
 
 	fmt.Printf("method is '%s'\n", method)
-	return nil, nil
 
 	/* (2) Try to load plugin */
 	p, err2 := plugin.Open(path)
@@ -119,10 +118,11 @@ func (i *Request) LoadController(method string) (implement.Controller, error) {
 	}
 
 	/* (4) Check signature */
-	callable, validSignature := m.(implement.Controller)
+	callable, validSignature := m.(func(implement.Arguments, *implement.Response) implement.Response)
 	if !validSignature {
 		return nil, fmt.Errorf("Invalid signature for method %s", method)
 	}
+	fmt.Printf("callable is %v\n", callable)
 
 	return callable, nil
 
diff --git a/router.go b/router.go
index 174447a..ae1717d 100644
--- a/router.go
+++ b/router.go
@@ -1,9 +1,11 @@
 package gfw
 
 import (
+	"encoding/json"
 	"fmt"
 	"git.xdrm.io/xdrm-brackets/gfw/config"
 	"git.xdrm.io/xdrm-brackets/gfw/err"
+	"git.xdrm.io/xdrm-brackets/gfw/implement"
 	"git.xdrm.io/xdrm-brackets/gfw/request"
 	"log"
 	"net/http"
@@ -121,15 +123,21 @@ func (s *Server) route(res http.ResponseWriter, httpReq *http.Request) {
 
 	/* (6) Execute and get response
 	---------------------------------------------------------*/
-	resp := callable(parameters)
-	if resp != nil {
-		fmt.Printf("-- OUT --\n")
-		for name, value := range resp.Dump() {
-			fmt.Printf("  $%s = %v\n", name, value)
-		}
-		eJSON, _ := resp.Err.MarshalJSON()
-		fmt.Printf("-- ERR --\n%s\n", eJSON)
+	/* (1) Execute */
+	responseBarebone := implement.NewResponse()
+	response := callable(parameters, responseBarebone)
+
+	/* (2) Build JSON response */
+	formattedResponse := response.Dump()
+	formattedResponse["error"] = response.Err.Code
+	formattedResponse["reason"] = response.Err.Reason
+	if response.Err.Arguments != nil && len(response.Err.Arguments) > 0 {
+		formattedResponse["args"] = response.Err.Arguments
 	}
+	jsonResponse, _ := json.Marshal(formattedResponse)
+
+	res.Header().Add("Content-Type", "application/json")
+	res.Write(jsonResponse)
 	return
 }