Sync model with WebDriver BiDi spec

Author: TahaHachana

cddl/all.cddl

@@ -81,11 +81,13 @@ ErrorCode = "invalid argument" /
             "invalid web extension" /
             "move target out of bounds" /
             "no such alert" /
+            "no such network collector" /
             "no such element" /
             "no such frame" /
             "no such handle" /
             "no such history entry" /
             "no such intercept" /
+            "no such network data" /
             "no such node" /
             "no such request" /
             "no such script" /
@@ -97,6 +99,7 @@ ErrorCode = "invalid argument" /
             "unable to close browser" /
             "unable to set cookie" /
             "unable to set file input" /
+            "unavailable network data" /
             "underspecified storage partition" /
             "unknown command" /
             "unknown error" /
@@ -151,7 +154,6 @@ session.DirectProxyConfiguration = (
 
 session.ManualProxyConfiguration = (
    proxyType: "manual",
-   ? ftpProxy: text,
    ? httpProxy: text,
    ? sslProxy: text,
    ? session.SocksProxyConfiguration,
@@ -300,9 +302,15 @@ browser.Close = (
 
 browser.CreateUserContext = (
   method: "browser.createUserContext",
-  params: EmptyParams,
+  params: browser.CreateUserContextParameters,
 )
 
+browser.CreateUserContextParameters = {
+  ? acceptInsecureCerts: bool,
+  ? proxy: session.ProxyConfiguration,
+  ? unhandledPromptBehavior: session.UserPromptHandler
+}
+
 browser.CreateUserContextResult = browser.UserContextInfo
 
 browser.GetClientWindows = (
@@ -383,6 +391,7 @@ BrowsingContextEvent = (
   browsingContext.ContextCreated //
   browsingContext.ContextDestroyed //
   browsingContext.DomContentLoaded //
+  browsingContext.DownloadEnd //
   browsingContext.DownloadWillBegin //
   browsingContext.FragmentNavigated //
   browsingContext.HistoryUpdated //
@@ -703,6 +712,7 @@ browsingContext.HistoryUpdated = (
 
 browsingContext.HistoryUpdatedParameters = {
   context: browsingContext.BrowsingContext,
+  timestamp: js-uint,
   url: text
 }
 
@@ -726,6 +736,29 @@ browsingContext.DownloadWillBeginParams = {
   browsingContext.BaseNavigationInfo
 }
 
+browsingContext.DownloadEnd = (
+  method: "browsingContext.downloadEnd",
+  params: browsingContext.DownloadEndParams
+)
+
+browsingContext.DownloadEndParams = {
+  (
+    browsingContext.DownloadCanceledParams //
+    browsingContext.DownloadCompleteParams
+  )
+}
+
+browsingContext.DownloadCanceledParams = (
+  status: "canceled",
+  browsingContext.BaseNavigationInfo
+)
+
+browsingContext.DownloadCompleteParams = (
+  status: "complete",
+  filepath: text / null,
+  browsingContext.BaseNavigationInfo
+)
+
 browsingContext.NavigationAborted = (
  method: "browsingContext.navigationAborted",
  params: browsingContext.NavigationInfo
@@ -767,7 +800,10 @@ browsingContext.UserPromptOpenedParameters = {
 }
 
 EmulationCommand = (
-  emulation.SetGeolocationOverride
+  emulation.SetGeolocationOverride //
+  emulation.SetLocaleOverride //
+  emulation.SetScreenOrientationOverride //
+  emulation.SetTimezoneOverride
 )
 
 emulation.SetGeolocationOverride = (
@@ -776,29 +812,81 @@ emulation.SetGeolocationOverride = (
 )
 
 emulation.SetGeolocationOverrideParameters = {
-  coordinates: emulation.GeolocationCoordinates / null,
+  (
+    (coordinates: emulation.GeolocationCoordinates / null) //
+    (error: emulation.GeolocationPositionError)
+  ),
   ? contexts: [+browsingContext.BrowsingContext],
   ? userContexts: [+browser.UserContext],
 }
 
 emulation.GeolocationCoordinates = {
-   latitude: float,
-   longitude: float,
-   ? accuracy: float .default 1.0,
+   latitude: -90.0..90.0,
+   longitude: -180.0..180.0,
+   ? accuracy: (float .ge 0.0) .default 1.0,
    ? altitude: float / null .default null,
-   ? altitudeAccuracy: float / null .default null,
-   ? heading: float / null .default null,
-   ? speed: float / null .default null,
+   ? altitudeAccuracy: (float .ge 0.0) / null .default null,
+   ? heading: (0.0...360.0) / null .default null,
+   ? speed: (float .ge 0.0) / null .default null,
+}
+
+emulation.GeolocationPositionError = {
+   type: "positionUnavailable"
+}
+
+emulation.SetLocaleOverride = (
+  method: "emulation.setLocaleOverride",
+  params: emulation.SetLocaleOverrideParameters
+)
+
+emulation.SetLocaleOverrideParameters = {
+  locale: text / null,
+  ? contexts: [+browsingContext.BrowsingContext],
+  ? userContexts: [+browser.UserContext],
+}
+
+emulation.SetScreenOrientationOverride = (
+  method: "emulation.setScreenOrientationOverride",
+  params: emulation.SetScreenOrientationOverrideParameters
+)
+
+emulation.ScreenOrientationNatural = "portrait" / "landscape"
+emulation.ScreenOrientationType = "portrait-primary" / "portrait-secondary" / "landscape-primary" / "landscape-secondary"
+
+emulation.ScreenOrientation = {
+  natural: emulation.ScreenOrientationNatural,
+  type: emulation.ScreenOrientationType
+}
+
+emulation.SetScreenOrientationOverrideParameters = {
+  screenOrientation: emulation.ScreenOrientation / null,
+  ? contexts: [+browsingContext.BrowsingContext],
+  ? userContexts: [+browser.UserContext],
+}
+
+emulation.SetTimezoneOverride = (
+  method: "emulation.setTimezoneOverride",
+  params: emulation.SetTimezoneOverrideParameters
+)
+
+emulation.SetTimezoneOverrideParameters = {
+  timezone: text / null,
+  ? contexts: [+browsingContext.BrowsingContext],
+  ? userContexts: [+browser.UserContext],
 }
 
 
 NetworkCommand = (
+  network.AddDataCollector //
   network.AddIntercept //
   network.ContinueRequest //
   network.ContinueResponse //
   network.ContinueWithAuth //
+  network.DisownData //
   network.FailRequest //
+  network.GetData //
   network.ProvideResponse //
+  network.RemoveDataCollector //
   network.RemoveIntercept //
   network.SetCacheBehavior
 )
@@ -851,8 +939,12 @@ network.Base64Value = {
   value: text,
 }
 
+network.Collector = text
+
+network.CollectorType = "blob"
+
 
-network.SameSite = "strict" / "lax" / "none"
+network.SameSite = "strict" / "lax" / "none" / "default"
 
 
 network.Cookie = {
@@ -873,6 +965,8 @@ network.CookieHeader = {
     value: network.BytesValue,
 }
 
+network.DataType = "response"
+
 network.FetchTimingInfo = {
     timeOrigin: float,
     requestTime: float,
@@ -974,6 +1068,23 @@ network.UrlPatternString = {
 }
 
 
+network.AddDataCollector = (
+  method: "network.addDataCollector",
+  params: network.AddDataCollectorParameters
+)
+
+network.AddDataCollectorParameters = {
+  dataTypes: [+network.DataType],
+  maxEncodedDataSize: js-uint,
+  ? collectorType: network.CollectorType .default "blob",
+  ? contexts: [+browsingContext.BrowsingContext],
+  ? userContexts: [+browser.UserContext],
+}
+
+network.AddDataCollectorResult = {
+  collector: network.Collector
+}
+
 network.AddIntercept = (
   method: "network.addIntercept",
   params: network.AddInterceptParameters
@@ -1039,6 +1150,17 @@ network.ContinueWithAuthNoCredentials = (
   action: "default" / "cancel"
 )
 
+network.DisownData = (
+  method: "network.disownData",
+  params: network.disownDataParameters
+)
+
+network.disownDataParameters = {
+  dataType: network.DataType,
+  collector: network.Collector,
+  request: network.Request,
+}
+
 network.FailRequest = (
   method: "network.failRequest",
   params: network.FailRequestParameters
@@ -1048,6 +1170,22 @@ network.FailRequestParameters = {
   request: network.Request,
 }
 
+network.GetData = (
+  method: "network.getData",
+  params: network.GetDataParameters
+)
+
+network.GetDataParameters = {
+  dataType: network.DataType,
+  ? collector: network.Collector,
+  ? disown: bool .default false,
+  request: network.Request,
+}
+
+network.GetDataResult = {
+  bytes: network.BytesValue,
+}
+
 network.ProvideResponse = (
   method: "network.provideResponse",
   params: network.ProvideResponseParameters
@@ -1062,6 +1200,15 @@ network.ProvideResponseParameters = {
   ?statusCode: js-uint,
 }
 
+network.RemoveDataCollector = (
+  method: "network.removeDataCollector",
+  params: network.RemoveDataCollectorParameters
+)
+
+network.RemoveDataCollectorParameters = {
+  collector: network.Collector
+}
+
 network.RemoveIntercept = (
   method: "network.removeIntercept",
   params: network.RemoveInterceptParameters
@@ -1199,10 +1346,10 @@ script.LocalValue = (
   script.PrimitiveProtocolValue /
   script.ChannelValue /
   script.ArrayLocalValue /
-  script.DateLocalValue /
+  { script.DateLocalValue } /
   script.MapLocalValue /
   script.ObjectLocalValue /
-  script.RegExpLocalValue /
+  { script.RegExpLocalValue } /
   script.SetLocalValue
 )
 
@@ -1213,10 +1360,10 @@ script.ArrayLocalValue = {
   value: script.ListLocalValue,
 }
 
-script.DateLocalValue = {
+script.DateLocalValue = (
   type: "date",
   value: text
-}
+)
 
 script.MappingLocalValue = [*[(script.LocalValue / text), script.LocalValue]];
 
@@ -1235,10 +1382,10 @@ script.RegExpValue = {
   ? flags: text,
 }
 
-script.RegExpLocalValue = {
+script.RegExpLocalValue = (
   type: "regexp",
   value: script.RegExpValue,
-}
+)
 
 script.SetLocalValue = {
   type: "set",
@@ -1426,14 +1573,16 @@ script.FunctionRemoteValue = {
 }
 
 script.RegExpRemoteValue = {
+  script.RegExpLocalValue,
   ? handle: script.Handle,
   ? internalId: script.InternalId,
-} .and script.RegExpLocalValue
+}
 
 script.DateRemoteValue = {
+  script.DateLocalValue,
   ? handle: script.Handle,
   ? internalId: script.InternalId,
-} .and script.DateLocalValue
+}
 
 script.MapRemoteValue = {
   type: "map",