Atmosfire 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162287999a23b418ef85804e5f3cd7c7b237545bd0e923103a4652d09c555a86
-  data.tar.gz: 60273f91549485a79b5feb9ebe74cf874dae08f9acf32d5ce1141425db999ca5
+  metadata.gz: a6019bf1753d127a42713023bacb28766618cbb070b4fb0d4f1014e0534c0198
+  data.tar.gz: b05c49f4859eb3acf8ee38a89ee325372eb6d830e9796195e54f5db23d402dde
 SHA512:
-  metadata.gz: 4fc45431dba36c103872cb929f67d04153cdc9850a1d39e2f99a762432d082d557988b6c1a4aca4ea070250ba304920b3fe7264f99d6edebc92d88ae6b802a32
-  data.tar.gz: e181db3af0bb47e2fbeb2eb10085f9a9f80686ae2f496c75e8315c400b7521b7ec448656e41011f2a219722cb844b15301feddfc6d397beff59ebab91cf154ab
+  metadata.gz: 64f31d799ebb6158e05a7aced34b500c8e70fb34cfd25973c3fffae5e968f03d29c063e78380e38d7259b98c73d516a0b63f1d9e4df3dc86e93b420910e446c7
+  data.tar.gz: 73a6e7eb8cb76c6ee61ac046c4a19a2c0e9a4c7d3c2a1e6a1031df91a870dfffdfafff63cbfcff85fbebc6f943acb35abac692f18aa21bdaa8e731274926f8f4

data/lib/atmosfire/at_uri.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 
 module Atmosfire
   module RequestUtils
@@ -16,7 +16,10 @@ end
 module Atmosfire
   module AtUriParser
     extend T::Sig
-    include RequestUtils
+
+    class << self
+      include RequestUtils
+    end
 
     Rule = Struct.new(:pattern, :transform)
 
@@ -45,10 +48,24 @@ module Atmosfire
         AtUri.new(repo: did, collection: "app.bsky.feed.post", rkey: rkey)
       end,
 
+      AtUriParser.create_rule(%r{^#{Regexp.escape("https://")}(bsky\.app)/profile/(.+)$}) do |_, handle, pds|
+        handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
+        AtUri.new(repo: did)
+      end,
+
       AtUriParser.create_rule(%r{^at://(.+)/(.+)/(\w+)$}) do |handle, collection, rkey, pds|
         handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
         AtUri.new(repo: did, collection: collection, rkey: rkey)
       end,
+      AtUriParser.create_rule(%r{^at://(.+)/(.+)$}) do |handle, collection, pds|
+        handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
+        AtUri.new(repo: did, collection: collection)
+      end,
+      AtUriParser.create_rule(%r{^at://(.+)$}) do |handle, pds|
+        handle.start_with?("did:") ? did = handle : did = resolve_handle(handle, pds)
+        AtUri.new(repo: did)
+      end,
+
     ]
   end
 
@@ -58,10 +75,20 @@ module Atmosfire
     const :collection, T.nilable(T.any(Atmosfire::Repo::Collection, String))
     const :rkey, T.nilable(String)
 
-    sig { returns(String) }
+    def resolve(pds: "https://bsky.social")
+      if @collection.nil?
+        Repo.new(@repo.to_s, pds)
+      elsif @rkey.nil?
+        Repo::Collection.new(Repo.new(@repo.to_s, pds), @collection.to_s, pds)
+      else
+        Record.from_uri(self, pds)
+      end
+    end
+
+    sig { params(pds: String).returns(String) }
 
-    def to_s
-      "at://#{repo}/#{collection}/#{rkey}"
+    def to_s(pds: "https://bsky.social")
+      self.resolve(pds: pds).to_uri
     end
   end
 end

data/lib/atmosfire/collection.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: true
 module Atmosfire
   class Repo
     class Collection < T::Struct
@@ -11,7 +11,7 @@ module Atmosfire
       sig { params(limit: Integer).returns(T::Array[Atmosfire::Record]) }
 
       def list(limit = 10)
-        self.repo.pds_endpoint
+        self.repo.xrpc
           .get.com_atproto_repo_listRecords(
             repo: self.repo.did,
             collection: self.collection,
@@ -22,10 +22,16 @@ module Atmosfire
         }
       end
 
+      def list_all()
+        T.must(get_paginated_data(self.repo, :com_atproto_repo_listRecords.to_s, key: "records", params: { repo: self.repo.to_s, collection: self.to_s }, cursor: nil) do |record|
+          Atmosfire::Record.from_hash(record)
+        end)
+      end
+
       sig { returns(String) }
 
       def to_uri
-        "at://#{self.repo.did}/#{self.collection}"
+        "at://#{self.repo.did}/#{self.collection}/"
       end
 
       sig { returns(String) }

data/lib/atmosfire/record.rb

@@ -36,18 +36,13 @@ module Atmosfire
 
       def create(content_hash, session, rkey = nil)
         return nil if content_hash["$type"].nil?
-        if rkey.nil?
-          from_uri(at_uri(session.xrpc.post.com_atproto_repo_createRecord(
-            repo: session.did,
-            collection: content_hash["$type"],
-            record: content_hash,
-          )["uri"]))
-        else from_uri(at_uri(session.xrpc.post.com_atproto_repo_createRecord(
+        params = {
           repo: session.did,
           collection: content_hash["$type"],
-          rkey: rkey,
           record: content_hash,
-        )["uri"]))         end
+        }
+        params[:rkey] = rkey unless rkey.nil?
+        from_uri(at_uri(session.xrpc.post.com_atproto_repo_createRecord(params)["uri"]))
       end
     end
 
@@ -68,6 +63,8 @@ module Atmosfire
       self.class.from_uri(self.uri, session.pds)
     end
 
+    sig { params(session: Atmosfire::Session).returns(T.nilable(Atmosfire::Record)) }
+
     def put(session)
       session.xrpc.post.com_atproto_repo_putRecord(
         repo: session.did,
@@ -86,5 +83,9 @@ module Atmosfire
         rkey: self.uri.rkey,
       )
     end
+
+    def to_uri
+      "at://#{self.uri.repo}/#{self.uri.collection}/#{self.uri.rkey}"
+    end
   end
 end

data/lib/atmosfire/repo.rb

@@ -12,12 +12,12 @@ class Atmosfire::Repo
   # @param authenticate [NilClass, Object] Additional authentication data (default: nil).
 
   def initialize(username, pds = "https://bsky.social", open: true, authenticate: nil)
-    @pds = pds
-    @pds_endpoint = XRPC::Client.new(pds)
+    @pds = T.let pds, String
+    @xrpc = T.let(XRPC::Client.new(pds), XRPC::Client)
     if username.start_with?("did:")
-      @did = username
+      @did = T.let(username, String)
     else
-      @did = resolve_handle(username, pds)
+      @did = T.let(resolve_handle(username, pds), String)
     end
     @record_list = []
     if open == true
@@ -32,9 +32,11 @@ class Atmosfire::Repo
   sig { returns(String) }
 
   def to_uri
-    "at://#{@did}"
+    "at://#{@did}/"
   end
 
+  sig { returns(String) }
+
   def to_s
     @did
   end
@@ -42,7 +44,7 @@ class Atmosfire::Repo
   sig { returns(Hash) }
 
   def describe_repo
-    @pds_endpoint.get.com_atproto_repo_describeRepo(repo: @did)
+    @xrpc.get.com_atproto_repo_describeRepo(repo: @did)
   end
 
   sig { returns(Hash) }
@@ -57,5 +59,5 @@ class Atmosfire::Repo
     Collection.new(repo: self, collection: collection)
   end
 
-  attr_reader :did, :record_list, :pds, :pds_endpoint
+  attr_reader :did, :record_list, :pds, :xrpc
 end

data/lib/atmosfire/requests.rb

@@ -7,6 +7,8 @@ module Atmosfire
   class UnauthorizedError < HTTPError; end
 
   module RequestUtils # Goal is to replace with pure XRPC eventually
+    extend T::Sig
+
     def resolve_handle(username, pds = "https://bsky.social")
       (XRPC::Client.new(pds).get.com_atproto_identity_resolveHandle(handle: username))["did"]
     end
@@ -66,5 +68,41 @@ module Atmosfire
         Authorization: "Bearer #{session.refresh_token}",
       })
     end
+
+    sig {
+      params(
+        session: T.any(Atmosfire::Session, Atmosfire::Repo),
+        method: String,
+        key: String,
+        params: Hash,
+        cursor: T.nilable(
+          String
+        ),
+        map_block: T.nilable(Proc),
+      )
+        .returns(T
+          .nilable(
+            Array
+          ))
+    }
+
+    def get_paginated_data(session, method, key:, params:, cursor: nil, &map_block)
+      (send_data = (params.merge({ :limit => 100, :cursor => cursor })))
+      response = session.xrpc.get.public_send(method, **send_data)
+      data = response.dig(key)
+
+      if data.nil? || data.empty?
+        return []
+      end
+
+      results = block_given? ? data.map(&map_block) : data
+      next_cursor = T.let(response.dig("cursor"), T.nilable(String))
+
+      if next_cursor.nil?
+        return results
+      else
+        return results + get_paginated_data(session, method, key: key, params: params, cursor: next_cursor, &map_block)
+      end
+    end
   end
 end

data/lib/atmosfire/session.rb

@@ -45,6 +45,8 @@ module Atmosfire
       raise UnauthorizedError if response["accessJwt"].nil?
       @access_token = response["accessJwt"]
       @refresh_token = response["refreshJwt"]
+      @xrpc = XRPC::Client.new(@pds, @access_token)
+      @refresher = XRPC::Client.new(@pds, @refresh_token)
     end
 
     sig { returns(T.nilable(Hash)) }
@@ -66,3 +68,21 @@ module Atmosfire
     end
   end
 end
+
+module Atmosfire
+  class TokenSession < Session
+    extend T::Sig
+
+    sig { params(token: String, pds: String).void }
+
+    def initialize(token, pds = "https://bsky.social")
+      @token = token
+      @pds = pds
+      open!
+    end
+
+    def open!
+      @xrpc = XRPC::Client.new(@pds, @token)
+    end
+  end
+end

data/lib/atmosfire/version.rb

@@ -1,4 +1,4 @@
 # typed: strict
 module Atmosfire
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Atmosfire
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shreyan Jain
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xrpc