Merge pull request wirepair#29 from wirepair/try_different_json_lib

Try different json lib

Author: wirepair

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog (2020)
 
+- May 18th: Replace encoding/json with https://github.com/json-iterator/go, heavy DOM usage should see reduction of memory by half. Updated to latest gcd / protocol.json file for 81.0.4044.138
 - April 19th: Fix bad merge
 - April 19th: Move to go modules, remove vendor directory. Fix gcdapigen to output version properly. Updated to latest gcd / protocol.json file for 81.0.4044.113
 

chrome_target.go

@@ -25,7 +25,6 @@ THE SOFTWARE.
 package gcd
 
 import (
-	"encoding/json"
 	"io"
 	"log"
 	"net"

gcd.go

@@ -25,7 +25,6 @@ THE SOFTWARE.
 package gcd
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -35,10 +34,14 @@ import (
 	"os/exec"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/wirepair/gcd/gcdapi"
 )
 
-var GCDVERSION = "v1.0.9"
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
+var GCDVERSION = "v1.0.10"
 
 var (
 	ErrNoTabAvailable = errors.New("no available tab found")

gcd_test.go

@@ -1,7 +1,6 @@
 package gcd
 
 import (
-	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"

gcdapi/accessibility.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/animation.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/applicationcache.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/audits.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 
@@ -22,25 +21,41 @@ type AuditsAffectedRequest struct {
 	Url       string `json:"url,omitempty"` //
 }
 
+// Information about the frame affected by an inspector issue.
+type AuditsAffectedFrame struct {
+	FrameId string `json:"frameId"` //
+}
+
 // This information is currently necessary, as the front-end has a difficult time finding a specific cookie. With this, we can convey specific error information without the cookie.
 type AuditsSameSiteCookieIssueDetails struct {
 	Cookie                 *AuditsAffectedCookie  `json:"cookie"`                   //
-	CookieWarningReasons   []string               `json:"cookieWarningReasons"`     //  enum values: WarnSameSiteUnspecifiedCrossSiteContext, WarnSameSiteNoneInsecure, WarnSameSiteUnspecifiedLaxAllowUnsafe, WarnSameSiteCrossSchemeSecureUrlMethodUnsafe, WarnSameSiteCrossSchemeSecureUrlLax, WarnSameSiteCrossSchemeSecureUrlStrict, WarnSameSiteCrossSchemeInsecureUrlMethodUnsafe, WarnSameSiteCrossSchemeInsecureUrlLax, WarnSameSiteCrossSchemeInsecureUrlStrict
+	CookieWarningReasons   []string               `json:"cookieWarningReasons"`     //  enum values: WarnSameSiteUnspecifiedCrossSiteContext, WarnSameSiteNoneInsecure, WarnSameSiteUnspecifiedLaxAllowUnsafe, WarnSameSiteStrictLaxDowngradeStrict, WarnSameSiteStrictCrossDowngradeStrict, WarnSameSiteStrictCrossDowngradeLax, WarnSameSiteLaxCrossDowngradeStrict, WarnSameSiteLaxCrossDowngradeLax
 	CookieExclusionReasons []string               `json:"cookieExclusionReasons"`   //  enum values: ExcludeSameSiteUnspecifiedTreatedAsLax, ExcludeSameSiteNoneInsecure
 	Operation              string                 `json:"operation"`                // Optionally identifies the site-for-cookies and the cookie url, which may be used by the front-end as additional context. enum values: SetCookie, ReadCookie
 	SiteForCookies         string                 `json:"siteForCookies,omitempty"` //
 	CookieUrl              string                 `json:"cookieUrl,omitempty"`      //
 	Request                *AuditsAffectedRequest `json:"request,omitempty"`        //
 }
 
+// No Description.
+type AuditsMixedContentIssueDetails struct {
+	ResourceType     string                 `json:"resourceType,omitempty"` // The type of resource causing the mixed content issue (css, js, iframe, form,...). Marked as optional because it is mapped to from blink::mojom::RequestContextType, which will be replaced by network::mojom::RequestDestination enum values: Audio, Beacon, CSPReport, Download, EventSource, Favicon, Font, Form, Frame, Image, Import, Manifest, Ping, PluginData, PluginResource, Prefetch, Resource, Script, ServiceWorker, SharedWorker, Stylesheet, Track, Video, Worker, XMLHttpRequest, XSLT
+	ResolutionStatus string                 `json:"resolutionStatus"`       // The way the mixed content issue is being resolved. enum values: MixedContentBlocked, MixedContentAutomaticallyUpgraded, MixedContentWarning
+	InsecureURL      string                 `json:"insecureURL"`            // The unsafe http url causing the mixed content issue.
+	MainResourceURL  string                 `json:"mainResourceURL"`        // The url responsible for the call to an unsafe url.
+	Request          *AuditsAffectedRequest `json:"request,omitempty"`      // The mixed content request. Does not always exist (e.g. for unsafe form submission urls).
+	Frame            *AuditsAffectedFrame   `json:"frame,omitempty"`        // Optional because not every mixed content issue is necessarily linked to a frame.
+}
+
 // This struct holds a list of optional fields with additional information specific to the kind of issue. When adding a new issue code, please also add a new optional field to this type.
 type AuditsInspectorIssueDetails struct {
 	SameSiteCookieIssueDetails *AuditsSameSiteCookieIssueDetails `json:"sameSiteCookieIssueDetails,omitempty"` //
+	MixedContentIssueDetails   *AuditsMixedContentIssueDetails   `json:"mixedContentIssueDetails,omitempty"`   //
 }
 
 // An inspector issue reported from the back-end.
 type AuditsInspectorIssue struct {
-	Code    string                       `json:"code"`    //  enum values: SameSiteCookieIssue
+	Code    string                       `json:"code"`    //  enum values: SameSiteCookieIssue, MixedContentIssue
 	Details *AuditsInspectorIssueDetails `json:"details"` //
 }
 

gcdapi/browser.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/cachestorage.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/css.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/database.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/debugger.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 
@@ -57,6 +56,12 @@ type DebuggerBreakLocation struct {
 	Type         string `json:"type,omitempty"`         //
 }
 
+// Debug symbols available for a wasm script.
+type DebuggerDebugSymbols struct {
+	Type        string `json:"type"`                  // Type of the debug symbols.
+	ExternalURL string `json:"externalURL,omitempty"` // URL of the external symbol source.
+}
+
 // Fired when breakpoint is resolved to an actual script and location.
 type DebuggerBreakpointResolvedEvent struct {
 	Method string `json:"method"`
@@ -124,6 +129,7 @@ type DebuggerScriptParsedEvent struct {
 		StackTrace              *RuntimeStackTrace     `json:"stackTrace,omitempty"`              // JavaScript top stack frame of where the script parsed event was triggered if available.
 		CodeOffset              int                    `json:"codeOffset,omitempty"`              // If the scriptLanguage is WebAssembly, the code section offset in the module.
 		ScriptLanguage          string                 `json:"scriptLanguage,omitempty"`          // The language of the script. enum values: JavaScript, WebAssembly
+		DebugSymbols            *DebuggerDebugSymbols  `json:"debugSymbols,omitempty"`            // If the scriptLanguage is WebASsembly, the source of debug symbols for the module.
 	} `json:"Params,omitempty"`
 }
 
@@ -288,6 +294,61 @@ func (c *Debugger) EvaluateOnCallFrame(callFrameId string, expression string, ob
 	return c.EvaluateOnCallFrameWithParams(&v)
 }
 
+type DebuggerExecuteWasmEvaluatorParams struct {
+	// WebAssembly call frame identifier to evaluate on.
+	CallFrameId string `json:"callFrameId"`
+	// Code of the evaluator module.
+	Evaluator string `json:"evaluator"`
+	// Terminate execution after timing out (number of milliseconds).
+	Timeout float64 `json:"timeout,omitempty"`
+}
+
+// ExecuteWasmEvaluatorWithParams - Execute a Wasm Evaluator module on a given call frame.
+// Returns -  result - Object wrapper for the evaluation result. exceptionDetails - Exception details.
+func (c *Debugger) ExecuteWasmEvaluatorWithParams(v *DebuggerExecuteWasmEvaluatorParams) (*RuntimeRemoteObject, *RuntimeExceptionDetails, error) {
+	resp, err := gcdmessage.SendCustomReturn(c.target, c.target.GetSendCh(), &gcdmessage.ParamRequest{Id: c.target.GetId(), Method: "Debugger.executeWasmEvaluator", Params: v})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var chromeData struct {
+		Result struct {
+			Result           *RuntimeRemoteObject
+			ExceptionDetails *RuntimeExceptionDetails
+		}
+	}
+
+	if resp == nil {
+		return nil, nil, &gcdmessage.ChromeEmptyResponseErr{}
+	}
+
+	// test if error first
+	cerr := &gcdmessage.ChromeErrorResponse{}
+	json.Unmarshal(resp.Data, cerr)
+	if cerr != nil && cerr.Error != nil {
+		return nil, nil, &gcdmessage.ChromeRequestErr{Resp: cerr}
+	}
+
+	if err := json.Unmarshal(resp.Data, &chromeData); err != nil {
+		return nil, nil, err
+	}
+
+	return chromeData.Result.Result, chromeData.Result.ExceptionDetails, nil
+}
+
+// ExecuteWasmEvaluator - Execute a Wasm Evaluator module on a given call frame.
+// callFrameId - WebAssembly call frame identifier to evaluate on.
+// evaluator - Code of the evaluator module.
+// timeout - Terminate execution after timing out (number of milliseconds).
+// Returns -  result - Object wrapper for the evaluation result. exceptionDetails - Exception details.
+func (c *Debugger) ExecuteWasmEvaluator(callFrameId string, evaluator string, timeout float64) (*RuntimeRemoteObject, *RuntimeExceptionDetails, error) {
+	var v DebuggerExecuteWasmEvaluatorParams
+	v.CallFrameId = callFrameId
+	v.Evaluator = evaluator
+	v.Timeout = timeout
+	return c.ExecuteWasmEvaluatorWithParams(&v)
+}
+
 type DebuggerGetPossibleBreakpointsParams struct {
 	// Start of range to search possible breakpoint locations in.
 	Start *DebuggerLocation `json:"start"`

gcdapi/dom.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/domdebugger.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/domsnapshot.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/domstorage.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/emulation.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 
@@ -21,6 +20,23 @@ type EmulationMediaFeature struct {
 	Value string `json:"value"` //
 }
 
+// Used to specify User Agent Cient Hints to emulate. See https://wicg.github.io/ua-client-hints
+type EmulationUserAgentBrandVersion struct {
+	Brand   string `json:"brand"`   //
+	Version string `json:"version"` //
+}
+
+// Used to specify User Agent Cient Hints to emulate. See https://wicg.github.io/ua-client-hints
+type EmulationUserAgentMetadata struct {
+	Brands          []*EmulationUserAgentBrandVersion `json:"brands"`          //
+	FullVersion     string                            `json:"fullVersion"`     //
+	Platform        string                            `json:"platform"`        //
+	PlatformVersion string                            `json:"platformVersion"` //
+	Architecture    string                            `json:"architecture"`    //
+	Model           string                            `json:"model"`           //
+	Mobile          bool                              `json:"mobile"`          //
+}
+
 type Emulation struct {
 	target gcdmessage.ChromeTargeter
 }
@@ -520,6 +536,8 @@ type EmulationSetUserAgentOverrideParams struct {
 	AcceptLanguage string `json:"acceptLanguage,omitempty"`
 	// The platform navigator.platform should return.
 	Platform string `json:"platform,omitempty"`
+	// To be sent in Sec-CH-UA-* headers and returned in navigator.userAgentData
+	UserAgentMetadata *EmulationUserAgentMetadata `json:"userAgentMetadata,omitempty"`
 }
 
 // SetUserAgentOverrideWithParams - Allows overriding user agent with the given string.
@@ -531,10 +549,12 @@ func (c *Emulation) SetUserAgentOverrideWithParams(v *EmulationSetUserAgentOverr
 // userAgent - User agent to use.
 // acceptLanguage - Browser langugage to emulate.
 // platform - The platform navigator.platform should return.
-func (c *Emulation) SetUserAgentOverride(userAgent string, acceptLanguage string, platform string) (*gcdmessage.ChromeResponse, error) {
+// userAgentMetadata - To be sent in Sec-CH-UA-* headers and returned in navigator.userAgentData
+func (c *Emulation) SetUserAgentOverride(userAgent string, acceptLanguage string, platform string, userAgentMetadata *EmulationUserAgentMetadata) (*gcdmessage.ChromeResponse, error) {
 	var v EmulationSetUserAgentOverrideParams
 	v.UserAgent = userAgent
 	v.AcceptLanguage = acceptLanguage
 	v.Platform = platform
+	v.UserAgentMetadata = userAgentMetadata
 	return c.SetUserAgentOverrideWithParams(&v)
 }

gcdapi/fetch.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/headlessexperimental.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/heapprofiler.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/indexeddb.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/io.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )
 

gcdapi/layertree.go

@@ -5,7 +5,6 @@
 package gcdapi
 
 import (
-	"encoding/json"
 	"github.com/wirepair/gcd/gcdmessage"
 )