commit 28146d789881135783c5035db4911f5cbffbdcf0 · comet.sh/atex

+6

lib/http.ex

···

       1
       +
       defmodule Atex.HTTP do

     

       2
       +
         @adapter Application.compile_env(:atex, :adapter, Atex.HTTP.Adapter.Req)

     

       3
       +
       

     

       4
       +
         defdelegate get(url, opts), to: @adapter

     

       5
       +
         defdelegate post(url, opts), to: @adapter

     

       6
       +
       end

+9 -13

lib/xrpc.ex

···

       1
        
       defmodule Atex.XRPC do

     

       2
       -
         alias Atex.XRPC

     

       3
       -
       

     

       4
       -
         defp adapter do

     

       5
       -
           Application.get_env(:atex, :adapter, XRPC.Adapter.Req)

     

       6
       -
         end

     

       7
        
       

     

       8
        
         # TODO: automatic user-agent, and env for changing it

     

       9
        
       

     
···

       16
        
         @doc """

     

       17
        
         Perform a HTTP GET on a XRPC resource. Called a "query" in lexicons.

     

       18
        
         """

     

       19
       -
         @spec get(XRPC.Client.t(), String.t(), keyword()) :: XRPC.Adapter.result()

     

       20
        
         def get(%XRPC.Client{} = client, name, opts \\ []) do

     

       21
        
           opts = put_auth(opts, client.access_token)

     

       22
       -
           adapter().get(url(client, name), opts)

     

       23
        
         end

     

       24
        
       

     

       25
        
         @doc """

     

       26
        
         Perform a HTTP POST on a XRPC resource. Called a "prodecure" in lexicons.

     

       27
        
         """

     

       28
       -
         @spec post(XRPC.Client.t(), String.t(), keyword()) :: XRPC.Adapter.result()

     

       29
        
         def post(%XRPC.Client{} = client, name, opts \\ []) do

     

       30
        
           # TODO: look through available HTTP clients and see if they have a

     

       31
        
           # consistent way of providing JSON bodies with auto content-type. If not,

     

       32
        
           # create one for adapters.

     

       33
        
           opts = put_auth(opts, client.access_token)

     

       34
       -
           adapter().post(url(client, name), opts)

     

       35
        
         end

     

       36
        
       

     

       37
        
         @doc """

     

       38
        
         Like `get/3` but is unauthenticated by default.

     

       39
        
         """

     

       40
       -
         @spec unauthed_get(String.t(), String.t(), keyword()) :: XRPC.Adapter.result()

     

       41
        
         def unauthed_get(endpoint, name, opts \\ []) do

     

       42
       -
           adapter().get(url(endpoint, name), opts)

     

       43
        
         end

     

       44
        
       

     

       45
        
         @doc """

     

       46
        
         Like `post/3` but is unauthenticated by default.

     

       47
        
         """

     

       48
       -
         @spec unauthed_post(String.t(), String.t(), keyword()) :: XRPC.Adapter.result()

     

       49
        
         def unauthed_post(endpoint, name, opts \\ []) do

     

       50
       -
           adapter().post(url(endpoint, name), opts)

     

       51
        
         end

     

       52
        
       

     

       53
        
         # TODO: use URI module for joining instead?

···

       1
        
       defmodule Atex.XRPC do

     

       2
       +
         alias Atex.{HTTP, XRPC}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
         # TODO: automatic user-agent, and env for changing it

     

       5
        
       

     
···

       12
        
         @doc """

     

       13
        
         Perform a HTTP GET on a XRPC resource. Called a "query" in lexicons.

     

       14
        
         """

     

       15
       +
         @spec get(XRPC.Client.t(), String.t(), keyword()) :: HTTP.Adapter.result()

     

       16
        
         def get(%XRPC.Client{} = client, name, opts \\ []) do

     

       17
        
           opts = put_auth(opts, client.access_token)

     

       18
       +
           HTTP.get(url(client, name), opts)

     

       19
        
         end

     

       20
        
       

     

       21
        
         @doc """

     

       22
        
         Perform a HTTP POST on a XRPC resource. Called a "prodecure" in lexicons.

     

       23
        
         """

     

       24
       +
         @spec post(XRPC.Client.t(), String.t(), keyword()) :: HTTP.Adapter.result()

     

       25
        
         def post(%XRPC.Client{} = client, name, opts \\ []) do

     

       26
        
           # TODO: look through available HTTP clients and see if they have a

     

       27
        
           # consistent way of providing JSON bodies with auto content-type. If not,

     

       28
        
           # create one for adapters.

     

       29
        
           opts = put_auth(opts, client.access_token)

     

       30
       +
           HTTP.post(url(client, name), opts)

     

       31
        
         end

     

       32
        
       

     

       33
        
         @doc """

     

       34
        
         Like `get/3` but is unauthenticated by default.

     

       35
        
         """

     

       36
       +
         @spec unauthed_get(String.t(), String.t(), keyword()) :: HTTP.Adapter.result()

     

       37
        
         def unauthed_get(endpoint, name, opts \\ []) do

     

       38
       +
           HTTP.get(url(endpoint, name), opts)

     

       39
        
         end

     

       40
        
       

     

       41
        
         @doc """

     

       42
        
         Like `post/3` but is unauthenticated by default.

     

       43
        
         """

     

       44
       +
         @spec unauthed_post(String.t(), String.t(), keyword()) :: HTTP.Adapter.result()

     

       45
        
         def unauthed_post(endpoint, name, opts \\ []) do

     

       46
       +
           HTTP.post(url(endpoint, name), opts)

     

       47
        
         end

     

       48
        
       

     

       49
        
         # TODO: use URI module for joining instead?

+2 -2

lib/xrpc/adapter.ex lib/http/adapter.ex

···

       1
       -
       defmodule Atex.XRPC.Adapter do

     

       2
        
         @moduledoc """

     

       3
       -
         Behaviour for defining a HTTP client adapter to be used for XRPC.

     

       4
        
         """

     

       5
        
       

     

       6
        
         @type success() :: {:ok, map()}

···

       1
       +
       defmodule Atex.HTTP.Adapter do

     

       2
        
         @moduledoc """

     

       3
       +
         Behaviour for defining a HTTP client adapter to be used within atex.

     

       4
        
         """

     

       5
        
       

     

       6
        
         @type success() :: {:ok, map()}

+3 -3

lib/xrpc/adapter/req.ex lib/http/adapter/req.ex

···

       1
       -
       defmodule Atex.XRPC.Adapter.Req do

     

       2
        
         @moduledoc """

     

       3
       -
         `Req` adapter for XRPC.

     

       4
        
         """

     

       5
        
       

     

       6
       -
         @behaviour Atex.XRPC.Adapter

     

       7
        
       

     

       8
        
         def get(url, opts) do

     

       9
        
           Req.get(url, opts) |> adapt()

···

       1
       +
       defmodule Atex.HTTP.Adapter.Req do

     

       2
        
         @moduledoc """

     

       3
       +
         `Req` adapter for atex.

     

       4
        
         """

     

       5
        
       

     

       6
       +
         @behaviour Atex.HTTP.Adapter

     

       7
        
       

     

       8
        
         def get(url, opts) do

     

       9
        
           Req.get(url, opts) |> adapt()

+5 -5

lib/xrpc/client.ex

···

       1
        
       defmodule Atex.XRPC.Client do

     

       2
       -
         @doc """

     

       3
        
         Struct to store client information for ATProto XRPC.

     

       4
        
         """

     

       5
        
       

     

       6
       -
         alias Atex.XRPC

     

       7
        
         use TypedStruct

     

       8
        
       

     

       9
        
         typedstruct do

     
···

       39
        
             iex> Atex.XRPC.Client.login("https://bsky.social", "example.com", "password123")

     

       40
        
             {:ok, %Atex.XRPC.Client{...}}

     

       41
        
         """

     

       42
       -
         @spec login(String.t(), String.t(), String.t()) :: {:ok, t()} | XRPC.Adapter.error()

     

       43
        
         @spec login(String.t(), String.t(), String.t(), String.t() | nil) ::

     

       44
       -
                 {:ok, t()} | XRPC.Adapter.error()

     

       45
        
         def login(endpoint, identifier, password, auth_factor_token \\ nil) do

     

       46
        
           json =

     

       47
        
             %{identifier: identifier, password: password}

     
···

       67
        
         @doc """

     

       68
        
         Request a new `refresh_token` for the given client.

     

       69
        
         """

     

       70
       -
         @spec refresh(t()) :: {:ok, t()} | XRPC.Adapter.error()

     

       71
        
         def refresh(%__MODULE__{endpoint: endpoint, refresh_token: refresh_token} = client) do

     

       72
        
           response =

     

       73
        
             XRPC.unauthed_post(

···

       1
        
       defmodule Atex.XRPC.Client do

     

       2
       +
         @moduledoc """

     

       3
        
         Struct to store client information for ATProto XRPC.

     

       4
        
         """

     

       5
        
       

     

       6
       +
         alias Atex.{XRPC, HTTP}

     

       7
        
         use TypedStruct

     

       8
        
       

     

       9
        
         typedstruct do

     
···

       39
        
             iex> Atex.XRPC.Client.login("https://bsky.social", "example.com", "password123")

     

       40
        
             {:ok, %Atex.XRPC.Client{...}}

     

       41
        
         """

     

       42
       +
         @spec login(String.t(), String.t(), String.t()) :: {:ok, t()} | HTTP.Adapter.error()

     

       43
        
         @spec login(String.t(), String.t(), String.t(), String.t() | nil) ::

     

       44
       +
                 {:ok, t()} | HTTP.Adapter.error()

     

       45
        
         def login(endpoint, identifier, password, auth_factor_token \\ nil) do

     

       46
        
           json =

     

       47
        
             %{identifier: identifier, password: password}

     
···

       67
        
         @doc """

     

       68
        
         Request a new `refresh_token` for the given client.

     

       69
        
         """

     

       70
       +
         @spec refresh(t()) :: {:ok, t()} | HTTP.Adapter.error()

     

       71
        
         def refresh(%__MODULE__{endpoint: endpoint, refresh_token: refresh_token} = client) do

     

       72
        
           response =

     

       73
        
             XRPC.unauthed_post(