cmd/africastalking/main.go

@@ -232,7 +232,7 @@ func main() {
 
 	rp := &atRequestParser{}
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	sh := httpserver.ToSessionHandler(bsh, httpserver.WithAtOutput())
+	sh := httpserver.NewATSessionHandler(bsh)
 	s := &http.Server{
 		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,

internal/http/at_session_handler.go

@@ -0,0 +1,93 @@
+package http
+
+import (
+	"io"
+	"net/http"
+
+	"git.grassecon.net/urdt/ussd/internal/handlers"
+)
+
+type ATSessionHandler struct {
+	*SessionHandler
+}
+
+func NewATSessionHandler(h handlers.RequestHandler) *ATSessionHandler {
+	return &ATSessionHandler{
+		SessionHandler: ToSessionHandler(h),
+	}
+}
+
+func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	var code int
+	var err error
+
+	rqs := handlers.RequestSession{
+		Ctx:    req.Context(),
+		Writer: w,
+	}
+
+	rp := ash.GetRequestParser()
+	cfg := ash.GetConfig()
+	cfg.SessionId, err = rp.GetSessionId(req)
+	if err != nil {
+		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
+		ash.writeError(w, 400, err)
+	}
+	rqs.Config = cfg
+	rqs.Input, err = rp.GetInput(req)
+	if err != nil {
+		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
+		ash.writeError(w, 400, err)
+		return
+	}
+
+	rqs, err = ash.Process(rqs)
+	switch err {
+	case handlers.ErrStorage:
+		code = 500
+	case handlers.ErrEngineInit:
+		code = 500
+	case handlers.ErrEngineExec:
+		code = 500
+	default:
+		code = 200
+	}
+
+	if code != 200 {
+		ash.writeError(w, 500, err)
+		return
+	}
+
+	w.WriteHeader(200)
+	w.Header().Set("Content-Type", "text/plain")
+	rqs, err = ash.ATOutput(rqs)
+	if err != nil {
+		ash.writeError(w, 500, err)
+		return
+	}
+
+	rqs, err = ash.Reset(rqs)
+	if err != nil {
+		ash.writeError(w, 500, err)
+		return
+	}
+}
+
+func (ash *ATSessionHandler) ATOutput(rqs handlers.RequestSession) (handlers.RequestSession, error) {
+	var err error
+	var prefix string
+
+	if rqs.Continue {
+		prefix = "CON "
+	} else {
+		prefix = "END "
+	}
+
+	_, err = io.WriteString(rqs.Writer, prefix)
+	if err != nil {
+		return rqs, err
+	}
+
+	_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
+	return rqs, err
+}