Add support for sessionId identification inside Target (https://chrom…

…ium.googlesource.com/chromium/src/+/237f82767da3bbdcd8d6ad3fa4449ef6a3fe8bd3)
wendigo · Jul 23, 2017 · 7428e38 · 7428e38
1 parent e9b96ff
commit 7428e38
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/logger.go b/logger.go
@@ -29,6 +29,7 @@ const (
 	fieldLevel       = "level"
 	fieldType        = "type"
 	fieldTargetId    = "targetId"
+	fieldSessionId   = "sessionId"
 	fieldRequest     = "request"
 	fieldMethod      = "method"
 	fieldInspectorId = "inspectorId"

diff --git a/main.go b/main.go
@@ -153,20 +153,20 @@ func dumpStream(logger *logrus.Entry, stream chan *protocolMessage) {
 				var targetLogger *logrus.Entry
 
 				if *flagDistributeLogs {
-					logger, err := createLogger(fmt.Sprintf("target-%s", msg.Params["targetId"]))
+					logger, err := createLogger(fmt.Sprintf("target-%s", msg.TargetId()))
 					if err != nil {
 						panic(fmt.Sprintf("could not create logger: %v", err))
 					}
 
 					targetLogger = logger.WithFields(logrus.Fields{
 						fieldLevel:    levelTarget,
-						fieldTargetId: msg.Params["targetId"],
+						fieldTargetId: msg.TargetId(),
 					})
 
 				} else {
 					targetLogger = logger.WithFields(logrus.Fields{
 						fieldLevel:    levelTarget,
-						fieldTargetId: msg.Params["targetId"],
+						fieldTargetId: msg.TargetId(),
 					})
 				}
 

diff --git a/protocol.go b/protocol.go
@@ -16,6 +16,7 @@ type protocolMessage struct {
 
 type targetedProtocolMessage struct {
 	TargetId string `json:"targetId"`
+	SessionId string `json:"sessionId"`
 	Message  string `json:"message"`
 }
 
@@ -53,3 +54,17 @@ func (p *protocolMessage) IsEvent() bool {
 func (p *protocolMessage) InTarget() bool {
 	return p.Method == "Target.sendMessageToTarget" || p.Method == "Target.receivedMessageFromTarget"
 }
+
+func (p *protocolMessage) TargetId() string {
+	if (p.InTarget()) {
+		if val, ok := p.Params["sessionId"]; ok {
+			return val.(string)
+		}
+
+		if val, ok := p.Params["targetId"]; ok {
+			return val.(string)
+		}
+	}
+
+	return ""
+}