BUGFIX: Fix using multiple contexts

Author: Andreas Sacher

dummypathmapper/dummypathmapper.go

@@ -9,29 +9,33 @@ import (
 	"github.com/dfeyer/flow-debugproxy/logger"
 	"github.com/dfeyer/flow-debugproxy/pathmapperfactory"
 	"github.com/dfeyer/flow-debugproxy/pathmapping"
+	"github.com/dfeyer/flow-debugproxy/xdebugproxy"
 )
 
 const framework = "dummy"
 
 func init() {
-	p := &PathMapper{}
+	p := &PathMapperFactory{}
 	pathmapperfactory.Register(framework, p)
 }
 
+type PathMapperFactory struct{}
+
+func (p *PathMapperFactory) Create(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping) xdebugproxy.XDebugProcessorPlugin {
+	return &PathMapper{
+		config:      c,
+		logger:      l,
+		pathMapping: m,
+	}
+}
+
 // PathMapper handle the mapping between real code and proxy
 type PathMapper struct {
 	config      *config.Config
 	logger      *logger.Logger
 	pathMapping *pathmapping.PathMapping
 }
 
-// Initialize the path mapper dependencies
-func (p *PathMapper) Initialize(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping) {
-	p.config = c
-	p.logger = l
-	p.pathMapping = m
-}
-
 // ApplyMappingToTextProtocol change file path in xDebug text protocol
 func (p *PathMapper) ApplyMappingToTextProtocol(message []byte) ([]byte, error) {
 	return message, nil

flowpathmapper/flowpathmapper.go

@@ -9,6 +9,7 @@ import (
 	"github.com/dfeyer/flow-debugproxy/logger"
 	"github.com/dfeyer/flow-debugproxy/pathmapperfactory"
 	"github.com/dfeyer/flow-debugproxy/pathmapping"
+	"github.com/dfeyer/flow-debugproxy/xdebugproxy"
 
 	"bytes"
 	"fmt"
@@ -37,7 +38,7 @@ var (
 )
 
 func init() {
-	p := &PathMapper{}
+	p := &PathMapperFactory{}
 	pathmapperfactory.Register(framework, p)
 }
 
@@ -48,20 +49,23 @@ func regexpFilename() *regexp.Regexp {
 	return regexpFilename__Unix
 }
 
+type PathMapperFactory struct{}
+
+func (p *PathMapperFactory) Create(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping) xdebugproxy.XDebugProcessorPlugin {
+	return &PathMapper{
+		config:      c,
+		logger:      l,
+		pathMapping: m,
+	}
+}
+
 // PathMapper handle the mapping between real code and proxy
 type PathMapper struct {
 	config      *config.Config
 	logger      *logger.Logger
 	pathMapping *pathmapping.PathMapping
 }
 
-// Initialize the path mapper dependencies
-func (p *PathMapper) Initialize(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping) {
-	p.config = c
-	p.logger = l
-	p.pathMapping = m
-}
-
 // ApplyMappingToTextProtocol change file path in xDebug text protocol
 func (p *PathMapper) ApplyMappingToTextProtocol(message []byte) ([]byte, error) {
 	return p.doTextPathMapping(message), nil
@@ -109,7 +113,9 @@ func (p *PathMapper) getCachePath(base, filename string) string {
 	context := p.config.Context
 	if strings.Contains(context, "/") {
 		contextParts := strings.Split(context, "/")
-		contextParts[1] = "SubContext" + contextParts[1]
+		for i := 1; i < len(contextParts); i++ {
+			contextParts[i] = "SubContext" + contextParts[i]
+		}
 		context = strings.Join(contextParts, "/")
 	}
 	cachePath = strings.Replace(cachePath, "@context@", context, 1)

pathmapperfactory/pathmapperfactory.go

@@ -13,20 +13,19 @@ import (
 	"errors"
 )
 
-var pathMapperRegistry = map[string]xdebugproxy.XDebugProcessorPlugin{}
+var pathMapperRegistry = map[string]xdebugproxy.XDebugProcessorPluginFactory{}
 
 // Register a path mapper
-func Register(f string, p xdebugproxy.XDebugProcessorPlugin) {
+func Register(f string, p xdebugproxy.XDebugProcessorPluginFactory) {
 	pathMapperRegistry[f] = p
 }
 
 // Create return a pathmapper for the given framework
 func Create(c *config.Config, p *pathmapping.PathMapping, l *logger.Logger) (xdebugproxy.XDebugProcessorPlugin, error) {
 	if _, exist := pathMapperRegistry[c.Framework]; exist {
-		pathmapper := pathMapperRegistry[c.Framework]
-		pathmapper.Initialize(c, l, p)
-		return pathmapper, nil
+		pathmapperFactory := pathMapperRegistry[c.Framework]
+		return pathmapperFactory.Create(c, l, p), nil
 	}
 
-	return nil, errors.New("Unsupported framework")
+	return nil, errors.New("unsupported framework")
 }

xdebugproxy/xdebugproxy.go

@@ -18,9 +18,12 @@ import (
 
 const h = "%s"
 
+type XDebugProcessorPluginFactory interface {
+	Create(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping) XDebugProcessorPlugin
+}
+
 // XDebugProcessorPlugin process message in xDebug protocol
 type XDebugProcessorPlugin interface {
-	Initialize(c *config.Config, l *logger.Logger, m *pathmapping.PathMapping)
 	ApplyMappingToTextProtocol(message []byte) ([]byte, error)
 	ApplyMappingToXML(message []byte) ([]byte, error)
 }