yonder 0.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2f1e9e39e76d3943e13103c9fc57bab664b1eafdd5ff88f94c1b41c0ce1cbb
-  data.tar.gz: 0c456c5e04016b65018ac80c4d88727576a170c59fd8e9a7510f10ea0c8366da
+  metadata.gz: 2702e3ab4ae8d1d1d254df861aba3dd705adfcd77c0900fc6200d024c6775676
+  data.tar.gz: e26e68823fe42d8d6813b9008067c7b69fa710cd7d045e2ca61ff9b225dd6e19
 SHA512:
-  metadata.gz: 8921c8b1951f18dcb21578adcf87259525efe9e02b64c9fe8d9f9208bea9d59105372d4ea0ef18434ee82fd4114f7b14f1ed661da33129ddf1f512c405ebcaa7
-  data.tar.gz: 878ee56b10802b4bc3b23b76313b06c0b1916b96809ab03162abf9624f376e486139db3b2c9920fe238a5d01f5b1fe2a5c07da43d3d0cc65c32ea6e3c1c98858
+  metadata.gz: b0e662fb8778962ab28be960cb87c2987d825225c64f0f5c1744db7f3b30d190d89e32cdcf39c40bfd804e933b92bfb79f38922171e412ae6c5f096a50bb22e0
+  data.tar.gz: 2a9a49a413a02c4e191fb04e5daa02c4bebac6b8fd3e77d9c56d4e5534243fe7761c27f43fb80ccbe76b49fc0f728e5b531596a5d4c1c5561e5c0be211caca89

data/lib/yonder/errors.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Yonder
+  class Error < StandardError; end
+
+  class NetworkError < Error; end
+  class RequestError < Error; end
+  class InvalidParamsError < RequestError; end
+  class RateLimitedError < RequestError; end
+  class AuthenticationError < RequestError; end
+  class TokenInvalidError < AuthenticationError; end
+  class TokenExpiredError < AuthenticationError; end
+  class ResponseError < Error; end
+end

data/lib/yonder/session.rb

@@ -0,0 +1,21 @@
+module Yonder
+  class Session
+    attr_accessor :user_did
+    attr_accessor :access_token
+    attr_accessor :refresh_token
+
+    def self.from_json(payload)
+      Session.new(
+        user_did: payload["did"],
+        access_token: payload["accessJwt"],
+        refresh_token: payload["refreshJwt"]
+      )
+    end
+
+    def initialize(user_did:, access_token:, refresh_token:)
+      @user_did = user_did
+      @access_token = access_token
+      @refresh_token = refresh_token
+    end
+  end
+end

data/lib/yonder/version.rb

@@ -1,3 +1,3 @@
 module Yonder
-  VERSION = 0.1
+  VERSION = 0.3
 end

data/lib/yonder.rb

@@ -3,67 +3,102 @@
 $LOAD_PATH.unshift(__dir__)
 
 require 'httpx'
+require 'yonder/session'
 require 'yonder/version'
+require 'yonder/errors'
 
 module Yonder
   class << self
     BASE_URL = "https://bsky.social"
+    COLLECTION_POST = 'app.bsky.feed.post'
+    ERROR_MAPPING = {
+      'AuthMissing' => AuthenticationError,
+      'ExpiredToken' => TokenExpiredError,
+      'InvalidToken' => TokenInvalidError
+    }
+
+    attr_accessor :api_host
+    attr_accessor :session
+    attr_accessor :user_agent
+
+    def create_post(user_did:, message:)
+      create_record(
+        user_did: user_did,
+        record: {
+          text: message,
+          createdAt: Time.now.iso8601
+        },
+        collection: COLLECTION_POST
+      )
+    end
 
-    attr_accessor :access_token
-    attr_accessor :refresh_token
-
-    def create_record(user_did:, record:, collection: 'app.bsky.feed.post')
-      post("/com.atproto.repo.createRecord", params: {
-        repo: user_did,
-        collection: collection,
-        record: record
-      })
+    def create_record(user_did:, record:, collection:)
+      post(
+        endpoint: "/com.atproto.repo.createRecord",
+        params: {
+          repo: user_did,
+          collection: collection,
+          record: record
+        }
+      )
     end
 
     def create_session(username:, password:)
-      post("/com.atproto.server.createSession", params: {
-        identifier: username,
-        password: password
-      })
+      response = post(
+        endpoint: "/com.atproto.server.createSession",
+        params: {
+          identifier: username,
+          password: password
+        }
+      )
+
+      @session = Session.from_json(response)
+      true
     end
 
-    def renew_session(renewal_token)
-      post("/com.atproto.server.refreshSession")
+    def refresh_session
+      response = post(
+        endpoint: "/com.atproto.server.refreshSession",
+        access_token: @session&.refresh_token
+      )
+
+      @session = Session.from_json(response)
+      true
     end
 
-    def get(endpoint)
-      make_api_request(endpoint, method: :get)
+    def get(endpoint:)
+      make_api_request(endpoint: endpoint, method: :get)
     end
 
-    def post(endpoint, params: {})
-      make_api_request(endpoint, method: :post, params: params)
+    def post(endpoint:, params: {}, access_token: nil)
+      make_api_request(endpoint: endpoint, method: :post, params: params, access_token: access_token)
     end
 
     private
 
-    def make_api_request(endpoint, method: :get, params: {})
-      response = http_client.request(method, endpoint, json: params)
+    def make_api_request(endpoint:, method: :get, params: {}, access_token: nil)
+      access_token ||= @session&.access_token
+
+      client = http_client
+      client = client.bearer_auth(access_token) unless access_token.nil?
+
+      response = client.request(method, endpoint, json: params)
 
       response.raise_for_status
       response.json
+    rescue HTTPX::TimeoutError, HTTPX::ResolveError => e
+      raise Yonder::RequestError.new(e.message)
+    rescue HTTPX::HTTPError => e
+      klass = ERROR_MAPPING.dig(e.response.json['error']) || NetworkError
+      raise klass.new(e.response.json['message'])
     end
 
     def http_client
-      client = HTTPX.with(
-        origin: BASE_URL,
-        headers: api_headers,
+      HTTPX.with(
+        origin: @api_host || BASE_URL,
+        headers: { "user-agent": @user_agent || "yonder v#{Yonder::VERSION}" },
         base_path: '/xrpc'
       ).plugin(:auth)
-
-      return client if @access_token.nil?
-
-      client.bearer_auth(@access_token)
-    end
-
-    def api_headers
-      {
-        "user-agent": @user_agent || "yonder v#{Yonder::VERSION}"
-      }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yonder
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.3'
 platform: ruby
 authors:
 - Daniel Bogan
@@ -31,6 +31,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/yonder.rb
+- lib/yonder/errors.rb
+- lib/yonder/session.rb
 - lib/yonder/version.rb
 homepage: http://github.com/waferbaby/yonder
 licenses: