API redesign: support pipelines

lib/playwright.ex

@@ -8,8 +8,8 @@ defmodule Playwright do
 
       alias Playwright.API.{Browser, Page, Response}
 
-      {:ok, browser}  = Playwright.launch(:chromium)
-      {:ok, page}     = Browser.new_page(browser)
+      {:ok, session, browser}  = Playwright.launch(:chromium)
+      {:ok, page} = Browser.new_page(browser)
       {:ok, response} = Page.goto(browser, "http://example.com")
 
       assert Response.ok(response)
@@ -18,6 +18,9 @@ defmodule Playwright do
   """
 
   use Playwright.SDK.ChannelOwner
+  alias Playwright
+  alias Playwright.APIRequest
+  alias Playwright.SDK.Channel
   alias Playwright.SDK.Config
 
   @property :chromium
@@ -33,6 +36,9 @@ defmodule Playwright do
   #   @typedoc "Options for `launch`."
   #   @type launch_options :: Playwright.SDK.Config.launch_options()
 
+  # API
+  # ---------------------------------------------------------------------------
+
   @doc """
   Initiates an instance of `Playwright.Browser` use the WebSocket transport.
 
@@ -55,7 +61,7 @@ defmodule Playwright do
     options = Map.merge(Config.connect_options(), options)
     {:ok, session} = new_session(Playwright.SDK.Transport.WebSocket, options)
     {:ok, browser} = new_browser(session, client, options)
-    {:ok, browser}
+    {:ok, session, browser}
   end
 
   @doc """
@@ -67,7 +73,7 @@ defmodule Playwright do
 
   ## Arguments
 
-  | key/name  | typ   |             | description |
+  | key/name  | type  |             | description |
   | ----------| ----- | ----------- | ----------- |
   | `client`  | param | `client()`  | The type of client (browser) to launch. |
   | `options` | param | `options()` | `Playwright.SDK.Config.launch_options()` |
@@ -77,24 +83,33 @@ defmodule Playwright do
     options = Map.merge(Config.launch_options(), options)
     {:ok, session} = new_session(Playwright.SDK.Transport.Driver, options)
     {:ok, browser} = new_browser(session, client, options)
-    {:ok, browser}
+    {:ok, session, browser}
+  end
+
+  def request(session) do
+    APIRequest.new(session)
   end
 
   # private
   # ----------------------------------------------------------------------------
 
   defp new_browser(session, client, options)
        when is_atom(client) and client in [:chromium, :firefox, :webkit] do
-    with play <- Playwright.SDK.Channel.find(session, {:guid, "Playwright"}),
+    with play <- Channel.find(session, {:guid, "Playwright"}),
          guid <- Map.get(play, client)[:guid] do
-      {:ok, Playwright.SDK.Channel.post(session, {:guid, guid}, :launch, options)}
+      playwright = %Playwright{
+        guid: guid,
+        session: session
+      }
+
+      {:ok, Channel.post({playwright, :launch}, options)}
     end
   end
 
   defp new_session(transport, args) do
     DynamicSupervisor.start_child(
-      Playwright.SDK.Channel.Session.Supervisor,
-      {Playwright.SDK.Channel.Session, {transport, args}}
+      Channel.Session.Supervisor,
+      {Channel.Session, {transport, args}}
     )
   end
 end

lib/playwright/sdk/channel/error.ex → lib/playwright/api/error.ex

@@ -1,29 +1,37 @@
-defmodule Playwright.SDK.Channel.Error do
+defmodule Playwright.API.Error do
   @moduledoc false
   # `Error` represents an error message received from the Playwright server
   # that is in response to a `Message` previously sent.
-  alias Playwright.SDK.Channel
 
   @enforce_keys [:type, :message]
-  defstruct [:type, :message]
+  defstruct [:type, :message, :wrapped]
 
   @type t() :: %__MODULE__{
           type: String.t(),
-          message: String.t()
+          message: String.t(),
+          wrapped: any()
         }
 
+  def new(%{error: %{name: name, message: message, wrapped: original} = _error}, _catalog) do
+    %__MODULE__{
+      type: name,
+      message: String.split(message, "\n") |> List.first(),
+      wrapped: original
+    }
+  end
+
   def new(%{error: %{name: name, message: message} = _error}, _catalog) do
-    %Channel.Error{
+    %__MODULE__{
       type: name,
       message: String.split(message, "\n") |> List.first()
     }
   end
 
-  # TODO: determine why we get here...
-  # DONE: see comment at error_handling.ex:9.
   def new(%{error: %{message: message} = _error}, _catalog) do
-    %Channel.Error{
-      type: "NotImplementedError",
+    # dbg(error)
+
+    %__MODULE__{
+      type: "UnknownError",
       message: String.split(message, "\n") |> List.first()
     }
   end